[compiler-rt] r372790 - [NFC] Invoke lipo from CMAKE_LIPO.

Puyan Lotfi via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 24 16:48:42 PDT 2019


Author: zer0
Date: Tue Sep 24 16:48:42 2019
New Revision: 372790

URL: http://llvm.org/viewvc/llvm-project?rev=372790&view=rev
Log:
[NFC] Invoke lipo from CMAKE_LIPO.

This shouldn't change anything, except that a cmake cache file that specifies
CMAKE_LIPO can specify an alternate lipo to use.

Modified:
    compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake

Modified: compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake?rev=372790&r1=372789&r2=372790&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Tue Sep 24 16:48:42 2019
@@ -1,6 +1,8 @@
 include(CMakeParseArguments)
 include(CompilerRTUtils)
 
+set(CMAKE_LIPO "lipo" CACHE PATH "path to the lipo tool")
+
 # On OS X SDKs can be installed anywhere on the base system and xcode-select can
 # set the default Xcode to use. This function finds the SDKs that are present in
 # the current Xcode.
@@ -244,7 +246,7 @@ function(darwin_lipo_libs name)
   if(LIB_DEPENDS AND LIB_LIPO_FLAGS)
     add_custom_command(OUTPUT ${LIB_OUTPUT_DIR}/lib${name}.a
       COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_OUTPUT_DIR}
-      COMMAND lipo -output
+      COMMAND ${CMAKE_LIPO} -output
               ${LIB_OUTPUT_DIR}/lib${name}.a
               -create ${LIB_LIPO_FLAGS}
       DEPENDS ${LIB_DEPENDS}




More information about the llvm-commits mailing list