Browse Source

Merge topic 'asm-restore-c-compiler'

d26efc3600 ASM: Restore CMAKE_{C,CXX}_COMPILER as ASM-first candidates

Acked-by: Kitware Robot <[email protected]>
Merge-request: !10644
Brad King 6 months ago
parent
commit
ed7f1c54eb
1 changed files with 4 additions and 0 deletions
  1. 4 0
      Modules/CMakeDetermineASMCompiler.cmake

+ 4 - 0
Modules/CMakeDetermineASMCompiler.cmake

@@ -23,8 +23,12 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
     if(NOT CMAKE_ASM_COMPILER_INIT)
       if(CMAKE_C_COMPILER_LOADED AND NOT CMAKE_C_COMPILER_ID MATCHES "^(MSVC)$")
         set(CMAKE_ASM_COMPILER_LIST ${CMAKE_C_COMPILER})
+      elseif(NOT CMAKE_C_COMPILER_LOADED AND CMAKE_C_COMPILER AND NOT CMAKE_C_COMPILER MATCHES "(^|/)[Cc][Ll](\\.|$)")
+        set(CMAKE_ASM_COMPILER_LIST ${CMAKE_C_COMPILER})
       elseif(CMAKE_CXX_COMPILER_LOADED AND NOT CMAKE_CXX_COMPILER_ID MATCHES "^(MSVC)$")
         set(CMAKE_ASM_COMPILER_LIST ${CMAKE_CXX_COMPILER})
+      elseif(NOT CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER AND NOT CMAKE_CXX_COMPILER MATCHES "(^|/)[Cc][Ll](\\.|$)")
+        set(CMAKE_ASM_COMPILER_LIST ${CMAKE_CXX_COMPILER})
       else()
         # List all default C and CXX compilers
         set(CMAKE_ASM_COMPILER_LIST