diff options
| author | Zachary Turner <zturner@google.com> | 2017-03-09 19:54:23 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-03-09 19:54:23 +0000 |
| commit | 30fdb05ddbe2d612f6784a5ed5f0f52c6fa5fa8f (patch) | |
| tree | d7f12a118d9c53986be3280168cad6f2ccb3f2c3 /lldb/packages/Python/lldbsuite | |
| parent | 10425de0632a602aa6f8e132128b5a48d822691b (diff) | |
| download | bcm5719-llvm-30fdb05ddbe2d612f6784a5ed5f0f52c6fa5fa8f.tar.gz bcm5719-llvm-30fdb05ddbe2d612f6784a5ed5f0f52c6fa5fa8f.zip | |
Make the LLDB test suite work with MSVC 2017 on Windows.
llvm-svn: 297405
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index ac9cf032642..40ab4023f3e 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -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 |
