summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-10-15 19:49:43 -0700
committerKhem Raj <raj.khem@gmail.com>2016-10-15 19:49:43 -0700
commitdd04c7f561c66e6edd9363e5da266fffa3bca26e (patch)
treed1aca2643c90a20b5a9cd56f40504680b53c84f1 /recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
parentafcd6a10cf70ffc92f6be8a13e57647635555192 (diff)
downloadmeta-clang-dd04c7f561c66e6edd9363e5da266fffa3bca26e.tar.gz
clang/llvm: Switch to 4.0.0 development version
3.9 is now branched for morty Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch')
-rw-r--r--recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch b/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
new file mode 100644
index 0000000..dbf3ea5
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
@@ -0,0 +1,45 @@
1From dc8fde5074321b80d23419127d28ce90ac984c96 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 May 2016 23:11:45 -0700
4Subject: [PATCH 2/3] Simplify cross-compilation. Don't use native-compiled
5 llvm-config.
6
7 Note: AddLLVM.cmake does not expose the LLVM source directory.
8 So if you want to run the test suite, you need to either:
9
10 1) set LLVM_MAIN_SRC_DIR explicitly (to find lit.py)
11 2) change AddLLVM.cmake to point to an installed 'lit'.
12 3) add_subdirectory(compiler-rt/test) from clang instead of compiler-rt.
13
14https://us.codeaurora.org/patches/quic/llvm/50683/compiler-rt-cross-compilation.patch
15
16Signed-off-by: Greg Fitzgerald <gregf@codeaurora.org>
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 CMakeLists.txt | 10 +++++++++-
20 1 file changed, 9 insertions(+), 1 deletion(-)
21
22diff --git a/CMakeLists.txt b/CMakeLists.txt
23index 5b1591e..7c6c0f4 100644
24--- a/CMakeLists.txt
25+++ b/CMakeLists.txt
26@@ -42,7 +42,15 @@ option(COMPILER_RT_BUILD_XRAY "Build xray" ON)
27 mark_as_advanced(COMPILER_RT_BUILD_XRAY)
28
29 if (COMPILER_RT_STANDALONE_BUILD)
30- load_llvm_config()
31+ find_package(LLVM REQUIRED)
32+ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
33+
34+ # Variables that AddLLVM.cmake depends on (included by AddCompilerRT)
35+ set(LLVM_TOOLS_BINARY_DIR "${LLVM_INSTALL_PREFIX}/bin")
36+ set(LLVM_LIBRARY_DIR "${LLVM_INSTALL_PREFIX}/lib")
37+
38+ set(LLVM_LIBRARY_OUTPUT_INTDIR
39+ ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
40
41 # Find Python interpreter.
42 set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5)
43--
442.10.0
45