diff options
| author | Zachary Turner <zturner@google.com> | 2016-09-06 22:40:11 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2016-09-06 22:40:11 +0000 |
| commit | 87daab322fff4ad1c85fa95d3577b89b802c8dfc (patch) | |
| tree | c1547d799f9a046d3c8001ba5d542c35e971b184 /lldb/packages/Python/lldbsuite/test | |
| parent | 3857f8f0ac48b6b702d0f04e72b286a9ef453d31 (diff) | |
| download | bcm5719-llvm-87daab322fff4ad1c85fa95d3577b89b802c8dfc.tar.gz bcm5719-llvm-87daab322fff4ad1c85fa95d3577b89b802c8dfc.zip | |
Revert "Fix tests on Windows."
This reverts commit 9b757b6e3946311802972409f38c6cefbea917b3.
This seems to cause strange breakages about on Ubuntu.
llvm-svn: 280763
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 5eb8caac8d6..3726826d4fd 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++14 +CXXFLAGS += -std=c++11 # 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++14,-std=c++0x,$(CXXFLAGS)) + override CXXFLAGS := $(subst -std=c++11,-std=c++0x,$(CXXFLAGS)) endif endif endif |
