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

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