diff options
| author | William R. Dieter <william.r.dieter@intel.com> | 2021-09-25 00:31:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-10 18:41:06 (GMT) |
| commit | 48f29b58053be4edfe4864f5cc6fcfbe6c1000f1 (patch) | |
| tree | 91ff51e1c79d61ac5043b6d524dcc31c7179c6a5 /Modules | |
| parent | d18ba5b2261530c72fb7ac6562dd261d009c9c3f (diff) | |
| download | CMake-48f29b58053be4edfe4864f5cc6fcfbe6c1000f1.zip CMake-48f29b58053be4edfe4864f5cc6fcfbe6c1000f1.tar.gz CMake-48f29b58053be4edfe4864f5cc6fcfbe6c1000f1.tar.bz2 | |
IntelLLVM: Use MSVC linker with MSVC frontend variant
The Intel compiler (pre-LLVM) expected xilink.exe and had special logic to
set xilink.exe. The newer LLVM-based compiler does not want xilink.exe.
link.exe works better for host code, and is the default, so change
the matching condition such that the old compiler matches (and gets
xilink.exe) and the new compiler gets the default link.exe it expects.
A better solution will be to use the compiler as the linker. A future
change will switch to compiler as linker by default, but that fix needs
more validation.
Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index 8e9237a..f3c2345 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -85,7 +85,7 @@ if(("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC" AND list(PREPEND _CMAKE_MT_NAMES "llvm-mt") list(PREPEND _CMAKE_LINKER_NAMES "lld-link") list(APPEND _CMAKE_TOOL_VARS NM) - elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIntel") + elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xIntel") list(PREPEND _CMAKE_AR_NAMES "xilib") list(PREPEND _CMAKE_LINKER_NAMES "xilink") endif() |