[Lldb-commits] [lldb] r280763 - Revert "Fix tests on Windows."

Zachary Turner via lldb-commits lldb-commits at lists.llvm.org
Tue Sep 6 15:40:11 PDT 2016


Author: zturner
Date: Tue Sep  6 17:40:11 2016
New Revision: 280763

URL: http://llvm.org/viewvc/llvm-project?rev=280763&view=rev
Log:
Revert "Fix tests on Windows."

This reverts commit 9b757b6e3946311802972409f38c6cefbea917b3.

This seems to cause strange breakages about on Ubuntu.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules

Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules?rev=280763&r1=280762&r2=280763&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Tue Sep  6 17:40:11 2016
@@ -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




More information about the lldb-commits mailing list