[llvm] 8dbc6a2 - [CMake] Do not override user specified CMAKE_{C,CXX}_ARCHIVE_FINISH on Linux

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2022-01-14T01:10:24-08:00
New Revision: 8dbc6a23bb1bc34dc372c2f700cf8f090fce16f0

URL: https://github.com/llvm/llvm-project/commit/8dbc6a23bb1bc34dc372c2f700cf8f090fce16f0
DIFF: https://github.com/llvm/llvm-project/commit/8dbc6a23bb1bc34dc372c2f700cf8f090fce16f0.diff

LOG: [CMake] Do not override user specified CMAKE_{C,CXX}_ARCHIVE_FINISH on Linux

Respect the user choice, e.g. -DCMAKE_CXX_ARCHIVE_FINISH=: (to skip the
(usually) no-op step).

Added: 
    

Modified: 
    llvm/cmake/modules/HandleLLVMOptions.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index f5c8f9aac58e5..600d3cc03d587 100644
--- a/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -192,12 +192,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Dqc <TARGET> <LINK_FLAGS> <OBJECTS>"
           CACHE STRING "archive create command")
       set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> Dq  <TARGET> <LINK_FLAGS> <OBJECTS>")
-      set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>")
+      set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>" CACHE STRING "ranlib command")
 
       set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Dqc <TARGET> <LINK_FLAGS> <OBJECTS>"
           CACHE STRING "archive create command")
       set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> Dq  <TARGET> <LINK_FLAGS> <OBJECTS>")
-      set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>")
+      set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -D <TARGET>" CACHE STRING "ranlib command")
     endif()
     file(REMOVE ${CMAKE_BINARY_DIR}/t.a)
   endif()