git.tremily.us Git - gentoo.git/blob

   1 From 8bd62a681744d3c31a0837c0f84f99ea4987e017 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
   3 Date: Tue, 9 Jun 2015 12:17:57 +0200
   4 Subject: [PATCH] cmake: Install compiler-rt into /usr/lib (without suffix)
   5
   6 ---
   7  CMakeLists.txt | 2 +-
   8  1 file changed, 1 insertion(+), 1 deletion(-)
   9
  10 diff --git a/CMakeLists.txt b/CMakeLists.txt
  11 index 0d8a880..5ae98a9 100644
  12 --- a/projects/compiler-rt/cmake/base-config-ix.cmake
  13 +++ b/projects/compiler-rt/cmake/base-config-ix.cmake
  14 @@ -52,7 +52,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
  15    # Setup the paths where compiler-rt runtimes and headers should be stored.
  16    set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
  17    set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
  18 -  set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
  19 +  set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION})
  20    option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
  21           ${LLVM_INCLUDE_TESTS})
  22   option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
  23 --
  24 2.4.3
  25