1234567891011121314151617181920212223242526272829303132333435363738394041424344 |
- From e1031fdbe63c6065b89e1e15f9bbc62cd36cd898 Mon Sep 17 00:00:00 2001
- From: Khem Raj <raj.khem@gmail.com>
- Date: Thu, 19 May 2016 23:11:45 -0700
- Subject: [PATCH] compiler-rt: Simplify cross-compilation. Don't use
- native-compiled llvm-config.
- Note: AddLLVM.cmake does not expose the LLVM source directory.
- So if you want to run the test suite, you need to either:
- 1) set LLVM_MAIN_SRC_DIR explicitly (to find lit.py)
- 2) change AddLLVM.cmake to point to an installed 'lit'.
- 3) add_subdirectory(compiler-rt/test) from clang instead of compiler-rt.
- https://us.codeaurora.org/patches/quic/llvm/50683/compiler-rt-cross-compilation.patch
- Upstream-Status: Pending
- Signed-off-by: Greg Fitzgerald <gregf@codeaurora.org>
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- ---
- compiler-rt/CMakeLists.txt | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
- diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
- index 8a13508fcb98..2c2bda5befa5 100644
- --- a/compiler-rt/CMakeLists.txt
- +++ b/compiler-rt/CMakeLists.txt
- @@ -89,7 +89,16 @@ if (COMPILER_RT_STANDALONE_BUILD)
- set(CMAKE_CXX_EXTENSIONS NO)
-
- if (NOT LLVM_RUNTIMES_BUILD)
- - load_llvm_config()
- + find_package(LLVM REQUIRED)
- + list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
- +
- + # Variables that AddLLVM.cmake depends on (included by AddCompilerRT)
- + set(LLVM_TOOLS_BINARY_DIR "${LLVM_INSTALL_PREFIX}/bin")
- + set(LLVM_LIBRARY_DIR "${LLVM_INSTALL_PREFIX}/lib")
- +
- + set(LLVM_LIBRARY_OUTPUT_INTDIR
- + ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
- +
- endif()
- if (TARGET intrinsics_gen)
- # Loading the llvm config causes this target to be imported so place it
|