From 87daab322fff4ad1c85fa95d3577b89b802c8dfc Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Tue, 6 Sep 2016 22:40:11 +0000 Subject: [PATCH] Revert "Fix tests on Windows." This reverts commit 9b757b6e3946311802972409f38c6cefbea917b3. This seems to cause strange breakages about on Ubuntu. llvm-svn: 280763 --- lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 4 ++-- 1 file 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 5eb8caa..3726826 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 -- 2.7.4