[compiler-rt] r342511 - build: clean up some unnecessary cached variables

Saleem Abdulrasool via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 18 13:33:01 PDT 2018


Author: compnerd
Date: Tue Sep 18 13:33:01 2018
New Revision: 342511

URL: http://llvm.org/viewvc/llvm-project?rev=342511&view=rev
Log:
build: clean up some unnecessary cached variables

The CMAKE_<LANG>_ARCHIVE_FINISH rule doesn't need to be cleared for Darwin
static libraries.  Avoid resetting the variables in the SIP case.  If
CMAKE_RANLIB is cached, then CMake's Ninja generator will invoke ranlib during
installation, not due to the CMAKE_<LANG>_ARCHIVE_FINISH rule.

Modified:
    compiler-rt/trunk/CMakeLists.txt

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=342511&r1=342510&r2=342511&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Tue Sep 18 13:33:01 2018
@@ -123,9 +123,6 @@ if (COMPILER_RT_STANDALONE_BUILD)
 
       foreach(lang ${languages})
         set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "\"${CMAKE_LIBTOOL}\" -static ${LIBTOOL_NO_WARNING_FLAG} -o <TARGET> <LINK_FLAGS> <OBJECTS>")
-        # Replace the finish target so that ranlib is not invoked on the
-        # archive.
-        set(CMAKE_${lang}_ARCHIVE_FINISH "")
       endforeach()
     endif()
 
@@ -136,8 +133,6 @@ if (COMPILER_RT_STANDALONE_BUILD)
         foreach(cmd ${CMAKE_${lang}_CREATE_STATIC_LIBRARY})
           list(APPEND CMAKE_${lang}_CREATE_STATIC_LIBRARY_NEW "${dyld_envar} ${cmd}")
         endforeach()
-        set(CMAKE_${lang}_CREATE_STATIC_LIBRARY ${CMAKE_${lang}_CREATE_STATIC_LIBRARY_NEW})
-        set(CMAKE_${lang}_ARCHIVE_FINISH " ")
       endforeach()
     endif()
   endif()




More information about the llvm-commits mailing list