Author: zturner
Date: Thu Mar  9 13:54:23 2017
New Revision: 297405

URL: http://llvm.org/viewvc/llvm-project?rev=297405&view=rev
Log:
Make the LLDB test suite work with MSVC 2017 on Windows.

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=297405&r1=297404&r2=297405&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Thu Mar  9 
13:54:23 2017
@@ -300,10 +300,12 @@ ifeq "$(OS)" "Windows_NT"
                # Clang for Windows doesn't support C++ Exceptions
                CXXFLAGS += -fno-exceptions
                CXXFLAGS += -D_HAS_EXCEPTIONS=0
-               ifeq "$(VisualStudioVersion)" "14.0"
-                       CXXFLAGS += -fms-compatibility-version=19.0
-                       override CXXFLAGS := $(subst 
-std=c++11,-std=c++14,$(CXXFLAGS))
-               endif
+
+               # MSVC 2015 or higher is required, which depends on c++14, so
+               # append these values unconditionally.
+               CXXFLAGS += -fms-compatibility-version=19.0
+               override CXXFLAGS := $(subst -std=c++11,-std=c++14,$(CXXFLAGS))
+
                # The MSVC linker doesn't understand long section names
                # generated by the clang compiler.
                LDFLAGS += -fuse-ld=lld


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to