diff options
| author | Ismail Donmez <ismail@i10z.com> | 2016-05-26 15:52:23 +0000 |
|---|---|---|
| committer | Ismail Donmez <ismail@i10z.com> | 2016-05-26 15:52:23 +0000 |
| commit | 6803422ad67ab2467d6604a7d08e033b7d1084af (patch) | |
| tree | b5252c8a5bfa9ebc2f744c7d68be78d824eb4649 /cmake | |
| parent | a14da14da0933e10f2dfc95eaee691a3b04a1b16 (diff) | |
Since some time clang itself figures out the default for ms-compatibility-version and uses it. Trying to figure it out during build is redundant and also will not work when the environment variable VSINSTALLDIR is not defined (which is not defined if you don't install whole Visual Studio but use Visual C++ Build Tools package).
Tested by bootstrapping clang with clang-cl.
Differential Revision: http://reviews.llvm.org/D20672
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@270860 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/HandleLLVMOptions.cmake | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index 5422c658277..d61f7477252 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -353,19 +353,6 @@ if( MSVC ) append("/Zc:rvalueCast" CMAKE_CXX_FLAGS) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # Find and run MSVC (not clang-cl) and get its version. This will tell - # clang-cl what version of MSVC to pretend to be so that the STL works. - execute_process(COMMAND "$ENV{VSINSTALLDIR}/VC/bin/cl.exe" - OUTPUT_QUIET - ERROR_VARIABLE MSVC_COMPAT_VERSION - ) - string(REGEX REPLACE "^.*Compiler Version ([0-9.]+) for .*$" "\\1" - MSVC_COMPAT_VERSION "${MSVC_COMPAT_VERSION}") - append("-fms-compatibility-version=${MSVC_COMPAT_VERSION}" - CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - endif() - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # clang-cl and cl by default produce non-deterministic binaries because # link.exe /incremental requires a timestamp in the .obj file. clang-cl # has the flag /Brepro to force deterministic binaries. We want to pass that |