Browse Source

Merge branch 'ipo-escape-toolchain-path' into release-3.10

Merge-request: !1356
Brad King 8 năm trước cách đây
mục cha
commit
71a2fe2753

+ 3 - 3
Modules/Compiler/Clang.cmake

@@ -69,15 +69,15 @@ else()
     endif()
     endif()
 
 
     set(CMAKE_${lang}_ARCHIVE_CREATE_IPO
     set(CMAKE_${lang}_ARCHIVE_CREATE_IPO
-      "${__ar} cr <TARGET> <LINK_FLAGS> <OBJECTS>"
+      "\"${__ar}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>"
     )
     )
 
 
     set(CMAKE_${lang}_ARCHIVE_APPEND_IPO
     set(CMAKE_${lang}_ARCHIVE_APPEND_IPO
-      "${__ar} r <TARGET> <LINK_FLAGS> <OBJECTS>"
+      "\"${__ar}\" r <TARGET> <LINK_FLAGS> <OBJECTS>"
     )
     )
 
 
     set(CMAKE_${lang}_ARCHIVE_FINISH_IPO
     set(CMAKE_${lang}_ARCHIVE_FINISH_IPO
-      "${__ranlib} <TARGET>"
+      "\"${__ranlib}\" <TARGET>"
     )
     )
   endmacro()
   endmacro()
 endif()
 endif()

+ 3 - 3
Modules/Compiler/GNU.cmake

@@ -75,15 +75,15 @@ macro(__compiler_gnu lang)
     #
     #
     # [1]: https://gcc.gnu.org/onlinedocs/gcc-4.9.4/gcc/Optimize-Options.html
     # [1]: https://gcc.gnu.org/onlinedocs/gcc-4.9.4/gcc/Optimize-Options.html
     set(CMAKE_${lang}_ARCHIVE_CREATE_IPO
     set(CMAKE_${lang}_ARCHIVE_CREATE_IPO
-      "${CMAKE_${lang}_COMPILER_AR} cr <TARGET> <LINK_FLAGS> <OBJECTS>"
+      "\"${CMAKE_${lang}_COMPILER_AR}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>"
     )
     )
 
 
     set(CMAKE_${lang}_ARCHIVE_APPEND_IPO
     set(CMAKE_${lang}_ARCHIVE_APPEND_IPO
-      "${CMAKE_${lang}_COMPILER_AR} r <TARGET> <LINK_FLAGS> <OBJECTS>"
+      "\"${CMAKE_${lang}_COMPILER_AR}\" r <TARGET> <LINK_FLAGS> <OBJECTS>"
     )
     )
 
 
     set(CMAKE_${lang}_ARCHIVE_FINISH_IPO
     set(CMAKE_${lang}_ARCHIVE_FINISH_IPO
-      "${CMAKE_${lang}_COMPILER_RANLIB} <TARGET>"
+      "\"${CMAKE_${lang}_COMPILER_RANLIB}\" <TARGET>"
     )
     )
   endif()
   endif()
 endmacro()
 endmacro()