[libcxx] r290939 - build: use the platform dependent library prefix/suffix

Saleem Abdulrasool via cfe-commits cfe-commits at lists.llvm.org
Tue Jan 3 21:49:58 PST 2017


Author: compnerd
Date: Tue Jan  3 23:49:57 2017
New Revision: 290939

URL: http://llvm.org/viewvc/llvm-project?rev=290939&view=rev
Log:
build: use the platform dependent library prefix/suffix

Use the cmake variables to get the platform dependent values for the
static library prefix and suffix, which can be different from the Unix
preference for "lib", ".a" (e.g. Windows uses "", ".lib" respectively).

Modified:
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=290939&r1=290938&r2=290939&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Tue Jan  3 23:49:57 2017
@@ -232,7 +232,8 @@ if (LIBCXX_ENABLE_STATIC)
     if (TARGET ${LIBCXX_CXX_ABI_LIBRARY})
       set(MERGE_ARCHIVES_ABI_TARGET "$<TARGET_LINKER_FILE:${LIBCXX_CXX_ABI_LIBRARY}>")
     else()
-      set(MERGE_ARCHIVES_ABI_TARGET "lib${LIBCXX_CXX_ABI_LIBRARY}.a")
+      set(MERGE_ARCHIVES_ABI_TARGET
+          "${CMAKE_STATIC_LIBRARY_PREFIX}${LIBCXX_CXX_ABI_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX}")
     endif()
     add_custom_command(TARGET cxx_static POST_BUILD
     COMMAND




More information about the cfe-commits mailing list