Sfoglia il codice sorgente

Merge topic 'sysroot-prefix' into release-3.18

e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/'

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5066
Brad King 5 anni fa
parent
commit
825e19b81f
1 ha cambiato i file con 3 aggiunte e 1 eliminazioni
  1. 3 1
      Modules/CMakeDetermineCompiler.cmake

+ 3 - 1
Modules/CMakeDetermineCompiler.cmake

@@ -140,7 +140,9 @@ function(_cmake_find_compiler_sysroot lang)
       OUTPUT_VARIABLE _cmake_sysroot_run_out
       ERROR_VARIABLE _cmake_sysroot_run_err)
 
-    if(_cmake_sysroot_run_out AND NOT _cmake_sysroot_run_err AND IS_DIRECTORY "${_cmake_sysroot_run_out}/usr")
+    if(_cmake_sysroot_run_out AND NOT _cmake_sysroot_run_err
+        AND NOT _cmake_sysroot_run_out STREQUAL "/"
+        AND IS_DIRECTORY "${_cmake_sysroot_run_out}/usr")
       file(TO_CMAKE_PATH "${_cmake_sysroot_run_out}/usr" _cmake_sysroot_run_out_usr)
       set(CMAKE_${lang}_COMPILER_SYSROOT "${_cmake_sysroot_run_out_usr}" PARENT_SCOPE)
     else()