summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2017-01-03 23:12:36 +0000
committerZachary Turner <zturner@google.com>2017-01-03 23:12:36 +0000
commit491fe5bec0460ac663e1fa83d198189c7bbb4f8e (patch)
tree65d1d66db546ee74995b7a6fc734c1fe0f6e8a49 /llvm
parent56ff4839aee715740271497b2a40c214f0aaedb3 (diff)
downloadbcm5719-llvm-491fe5bec0460ac663e1fa83d198189c7bbb4f8e.tar.gz
bcm5719-llvm-491fe5bec0460ac663e1fa83d198189c7bbb4f8e.zip
Fix the MSVC version check.
I'm not sure what determines the minor version, but it appears that it's possible for a fully updated, release version of VS2015 with Update 3 can go (at least) as low as 19.00.24213.1. Updating the compiler version check to account for this so we don't generate superfluous warnings. llvm-svn: 290914
Diffstat (limited to 'llvm')
-rw-r--r--llvm/cmake/modules/CheckCompilerVersion.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/cmake/modules/CheckCompilerVersion.cmake b/llvm/cmake/modules/CheckCompilerVersion.cmake
index cdad7ce2765..2e8f5445781 100644
--- a/llvm/cmake/modules/CheckCompilerVersion.cmake
+++ b/llvm/cmake/modules/CheckCompilerVersion.cmake
@@ -43,8 +43,8 @@ int main() { return (float)x; }"
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0)
message(FATAL_ERROR "Host Visual Studio must be at least 2015")
- elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.00.24215.1)
- message(WARNING "Host Visual Studio should at least be 2015 Update 3 (MSVC 19.00.24215.1)"
+ elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.00.24213.1)
+ message(WARNING "Host Visual Studio should at least be 2015 Update 3 (MSVC 19.00.24213.1)"
" due to miscompiles from earlier versions")
endif()
endif()
OpenPOWER on IntegriCloud