Prechádzať zdrojové kódy

Merge topic 'clang-use-arg1' into release-3.28

7008fc234b CMakeDetermineCompilerId: use `_ARG1` to query the clang resource dir

Acked-by: Kitware Robot <[email protected]>
Merge-request: !9285
Brad King 1 rok pred
rodič
commit
5feddb6f4b
1 zmenil súbory, kde vykonal 3 pridanie a 1 odobranie
  1. 3 1
      Modules/CMakeDetermineCompilerId.cmake

+ 3 - 1
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