This is an archive of the discontinued LLVM Phabricator instance.

Differential D73751

[CMake] Fix MSVC buggy version check
ClosedPublic

Authored by ctetreau on Jan 30 2020, 3:27 PM.

Details

Reviewers
mehdi_amini
efriedma
apazos
Summary
  • Add parens and ${} to cmake check to work around CMake configure time "unknown arguments specified" issue

Diff Detail

Event Timeline

ctetreau created this revision.Jan 30 2020, 3:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 30 2020, 3:27 PM
Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript
ctetreau added reviewers: mehdi_amini, efriedma, apazos.Jan 30 2020, 3:28 PM
Harbormaster completed remote builds in B45402: Diff 241604.Jan 30 2020, 3:35 PM
mehdi_amini accepted this revision.Jan 30 2020, 3:42 PM

Oh I missed this revision and reverted based on the comment in the original review (D73677).

I'm fine with your fix if it works, you will need to cherry-pick the original commit to land this on top.

This revision is now accepted and ready to land.Jan 30 2020, 3:42 PM
mehdi_amini mentioned this in D73677: MSVC Buggy version detection: turn pre-processor error into CMake configuration time check.Jan 30 2020, 3:43 PM
ctetreau added a comment.Jan 30 2020, 3:54 PM

Thanks for the quick code review! I actually don't have commit access, can you please commit it for me? Thanks!

RKSimon closed this revision.Jan 31 2020, 3:54 AM
RKSimon added a subscriber: RKSimon.

This was committed at rG5f940220bf94

Revision Contents

PathSize
llvm/
cmake/
modules/
6 lines

Diff 241604

llvm/cmake/modules/CheckCompilerVersion.cmake

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Lines
check_compiler_version("GNU" "GCC" ${GCC_MIN} ${GCC_SOFT_ERROR}) check_compiler_version("GNU" "GCC" ${GCC_MIN} ${GCC_SOFT_ERROR})
check_compiler_version("Clang" "Clang" ${CLANG_MIN} ${CLANG_SOFT_ERROR}) check_compiler_version("Clang" "Clang" ${CLANG_MIN} ${CLANG_SOFT_ERROR})
check_compiler_version("AppleClang" "Apple Clang" ${APPLECLANG_MIN} ${APPLECLANG_SOFT_ERROR}) check_compiler_version("AppleClang" "Apple Clang" ${APPLECLANG_MIN} ${APPLECLANG_SOFT_ERROR})
check_compiler_version("MSVC" "Visual Studio" ${MSVC_MIN} ${MSVC_SOFT_ERROR}) check_compiler_version("MSVC" "Visual Studio" ${MSVC_MIN} ${MSVC_SOFT_ERROR})
# See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html
# and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" # and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly"
# on llvm-dev Jan 21-23 2020. # on llvm-dev Jan 21-23 2020.
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND if ((${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) AND
19.24 VERSION_LESS_EQUAL CMAKE_CXX_COMPILER_VERSION AND (19.24 VERSION_LESS_EQUAL ${CMAKE_CXX_COMPILER_VERSION}) AND
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.25) (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 19.25))
if(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN) if(LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN)
message(WARNING "Host Visual Studio version 16.4 is known to miscompile part of LLVM") message(WARNING "Host Visual Studio version 16.4 is known to miscompile part of LLVM")
else() else()
message(FATAL_ERROR "Host Visual Studio version 16.4 is known to miscompile part of LLVM, please use clang-cl or upgrade to 16.5 or above (use -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON to ignore)") message(FATAL_ERROR "Host Visual Studio version 16.4 is known to miscompile part of LLVM, please use clang-cl or upgrade to 16.5 or above (use -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON to ignore)")
endif() endif()
endif() endif()
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines