[libcxxabi] r212826 - Support LLVM_LIBDIR_SUFFIX.

Dan Albert danalbert at google.com
Fri Jul 11 08:52:58 PDT 2014


Author: danalbert
Date: Fri Jul 11 10:52:58 2014
New Revision: 212826

URL: http://llvm.org/viewvc/llvm-project?rev=212826&view=rev
Log:
Support LLVM_LIBDIR_SUFFIX.

This is useful for distros installing under /usr/lib64.

Patch from İsmail Dönmez.

Modified:
    libcxxabi/trunk/src/CMakeLists.txt
    libcxxabi/trunk/src/Unwind/CMakeLists.txt

Modified: libcxxabi/trunk/src/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=212826&r1=212825&r2=212826&view=diff
==============================================================================
--- libcxxabi/trunk/src/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/CMakeLists.txt Fri Jul 11 10:52:58 2014
@@ -82,6 +82,6 @@ set_target_properties(cxxabi
   )
 
 install(TARGETS cxxabi
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
   )

Modified: libcxxabi/trunk/src/Unwind/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/CMakeLists.txt?rev=212826&r1=212825&r2=212826&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/CMakeLists.txt (original)
+++ libcxxabi/trunk/src/Unwind/CMakeLists.txt Fri Jul 11 10:52:58 2014
@@ -96,6 +96,6 @@ set_target_properties(unwind
   )
 
 install(TARGETS unwind
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
   )





More information about the cfe-commits mailing list