summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-09 17:10:08 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-03-09 17:10:14 (GMT)
commit0402d35168383f7fe64b3317b5a5724fb940a6ef (patch)
tree0b86821595553ec3514b7aaa6be9800d79d28005
parent5b29664e5890c398914979086d2547f0e9d41d60 (diff)
parent73d0d4e4b5dd937dcc913a94a6ebac3085a01896 (diff)
downloadCMake-0402d35168383f7fe64b3317b5a5724fb940a6ef.zip
CMake-0402d35168383f7fe64b3317b5a5724fb940a6ef.tar.gz
CMake-0402d35168383f7fe64b3317b5a5724fb940a6ef.tar.bz2
Merge topic 'binutils-llvm-mt' into release-3.23
73d0d4e4b5 BinUtils: Avoid llvm-mt because it is missing 'mt' features we use Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7054
-rw-r--r--Modules/CMakeFindBinUtils.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 6dbe626..16d3106 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -82,7 +82,8 @@ if(("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC" AND
if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xClang")
set(_CMAKE_NM_NAMES "llvm-nm" "nm")
list(PREPEND _CMAKE_AR_NAMES "llvm-lib")
- list(PREPEND _CMAKE_MT_NAMES "llvm-mt")
+ # llvm-mt does not support all flags we need in vs_link_exe
+ # 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}" STREQUAL "xIntel")