From: Zachary Turner <zturner@google.com>
Date: Tue, 6 Sep 2016 22:14:22 +0000 (+0000)
Subject: Fix tests on Windows.
X-Git-Tag: llvmorg-4.0.0-rc1~10510
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4349e8f9b013269e2e14977acbfd83518d4794df;p=platform%2Fupstream%2Fllvm.git

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
---

diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 3726826..5eb8caa 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