summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-02-27 14:02:27 (GMT)
committerBrad King <brad.king@kitware.com>2024-02-27 14:02:27 (GMT)
commit5feddb6f4b081fc3eac9682b68058ec758e244fb (patch)
tree67a3750cd47a661d61d58e09a00a3ce763fb412f
parente98cbbf65f9a7bde3d0ac5726aa2b74abd8f3f88 (diff)
parent7008fc234b189d5e3068fb8b6fca9ed76df600f5 (diff)
downloadCMake-5feddb6f4b081fc3eac9682b68058ec758e244fb.zip
CMake-5feddb6f4b081fc3eac9682b68058ec758e244fb.tar.gz
CMake-5feddb6f4b081fc3eac9682b68058ec758e244fb.tar.bz2
Merge topic 'clang-use-arg1' into release-3.28
7008fc234b CMakeDetermineCompilerId: use `_ARG1` to query the clang resource dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9285
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index dd2bce2..85c555a 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -292,7 +292,9 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
"x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xClang" AND
"x${CMAKE_${lang}_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
execute_process(
- COMMAND "${CMAKE_${lang}_COMPILER}" -print-resource-dir
+ COMMAND "${CMAKE_${lang}_COMPILER}"
+ ${CMAKE_${lang}_COMPILER_ID_ARG1}
+ -print-resource-dir
OUTPUT_VARIABLE _clang_resource_dir_out
ERROR_VARIABLE _clang_resource_dir_err
RESULT_VARIABLE _clang_resource_dir_res