diff options
author | Zachary Turner <zturner@google.com> | 2016-09-06 22:14:22 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2016-09-06 22:14:22 +0000 |
commit | 4349e8f9b013269e2e14977acbfd83518d4794df (patch) | |
tree | 37f08bc90c7ed3dc10c73ec844c338a3ccef40ae /lldb/packages/Python/lldbsuite/test | |
parent | 816e762fcc4f9c9296511065a979bf77a5ccf29a (diff) | |
download | bcm5719-llvm-4349e8f9b013269e2e14977acbfd83518d4794df.tar.gz bcm5719-llvm-4349e8f9b013269e2e14977acbfd83518d4794df.zip |
Fix tests on Windows.
This wasn't actually a problem with the reformat, but rather a
problem with Visual Studio 2015 Update 3, which uses some c++14
features in its standard libraries. So we had to change -std=c++11
to -std=c++14.
llvm-svn: 280759
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 3726826d4fd..5eb8caac8d6 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -216,7 +216,7 @@ ifeq "$(MAKE_GMODULES)" "YES" CFLAGS += -fmodules -gmodules endif -CXXFLAGS += -std=c++11 +CXXFLAGS += -std=c++14 # FIXME: C++ modules aren't supported on all platforms. CXXFLAGS += $(subst -fmodules,, $(CFLAGS)) LD = $(CC) @@ -444,7 +444,7 @@ ifneq "$(filter g++,$(CXX))" "" ifeq "$(CXXVERSION)" "4.6" # GCC 4.6 cannot handle -std=c++11, so replace it with -std=c++0x # instead. FIXME: remove once GCC version is upgraded. - override CXXFLAGS := $(subst -std=c++11,-std=c++0x,$(CXXFLAGS)) + override CXXFLAGS := $(subst -std=c++14,-std=c++0x,$(CXXFLAGS)) endif endif endif |