- added missing BRs, adjusted conditions wrt. x32

[packages/llvm.git] / libdir.patch

--- llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake~	2015-06-29 21:57:59.000000000 +0200
+++ llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake	2015-09-09 21:36:43.080128117 +0200
@@ -46,7 +46,7 @@
   endif(MSVC)
   install(TARGETS ${name}
     EXPORT LLVMExports
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
     ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
 endmacro(add_polly_library)
--- llvm-3.7.0.src/bindings/ocaml/llvm/CMakeLists.txt.orig	2014-12-30 04:24:07.000000000 +0100
+++ llvm-3.7.0.src/bindings/ocaml/llvm/CMakeLists.txt	2015-10-03 17:47:47.253164926 +0200
@@ -8,4 +8,4 @@
   "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
 
 install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
-        DESTINATION lib/ocaml)
+        DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
--- llvm-3.7.0.src/bindings/ocaml/backends/CMakeLists.txt.orig	2014-12-30 04:24:07.000000000 +0100
+++ llvm-3.7.0.src/bindings/ocaml/backends/CMakeLists.txt	2015-10-03 17:48:57.483480254 +0200
@@ -23,5 +23,5 @@
     "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
 
   install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
-          DESTINATION lib/ocaml)
+          DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
 endforeach()
--- llvm-3.7.0.src/cmake/modules/AddOCaml.cmake.orig	2015-06-07 21:22:22.000000000 +0200
+++ llvm-3.7.0.src/cmake/modules/AddOCaml.cmake	2015-10-03 18:13:42.583970785 +0200
@@ -183,12 +183,12 @@
   endforeach()
 
   install(FILES ${install_files}
-          DESTINATION lib/ocaml)
+          DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
   install(FILES ${install_shlibs}
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                       GROUP_READ GROUP_EXECUTE
                       WORLD_READ WORLD_EXECUTE
-          DESTINATION lib/ocaml)
+          DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
 
   foreach( install_file ${install_files} ${install_shlibs} )
     get_filename_component(filename "${install_file}" NAME)