From 6c9f8f33863d666b63fd670f108ce90a37d69fa8 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 18 Sep 2018 20:33:01 +0000 Subject: build: clean up some unnecessary cached variables The CMAKE__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__ARCHIVE_FINISH rule. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@342511 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4f185602..f363a511f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ") - # 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() -- cgit v1.2.3