[compiler-rt] r249870 - [CMake] [Darwin] [builtins] Need to special case the naming of the OS X cc_kext builtin library.

Chris Bieneman via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 9 11:38:34 PDT 2015


Author: cbieneman
Date: Fri Oct  9 13:38:34 2015
New Revision: 249870

URL: http://llvm.org/viewvc/llvm-project?rev=249870&view=rev
Log:
[CMake] [Darwin] [builtins] Need to special case the naming of the OS X cc_kext builtin library.

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=249870&r1=249869&r2=249870&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTDarwinUtils.cmake Fri Oct  9 13:38:34 2015
@@ -293,7 +293,11 @@ macro(darwin_add_builtin_libraries)
                                 DEFS KERNEL_USE
                                 PARENT_TARGET builtins)
       endforeach()
-      darwin_lipo_libs(clang_rt.cc_kext_${os}
+      set(archive_name clang_rt.cc_kext_${os})
+      if(${os} STREQUAL "osx")
+        set(archive_name clang_rt.cc_kext)
+      endif()
+      darwin_lipo_libs(${archive_name}
                       PARENT_TARGET builtins
                       LIPO_FLAGS ${${os}_cc_kext_lipo_flags}
                       DEPENDS ${${os}_cc_kext_libs}




More information about the llvm-commits mailing list