diff options
-rw-r--r-- | recipes-devtools/clang/clang/0024-fix-path-to-libffi.patch | 28 | ||||
-rw-r--r-- | recipes-devtools/clang/common.inc | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang/0024-fix-path-to-libffi.patch b/recipes-devtools/clang/clang/0024-fix-path-to-libffi.patch new file mode 100644 index 0000000..2890228 --- /dev/null +++ b/recipes-devtools/clang/clang/0024-fix-path-to-libffi.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 52b4e74809eba796663f0f65194ab4f3eafe2cb1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Fri, 3 Apr 2020 15:10:37 +0800 | ||
4 | Subject: [PATCH] fix path to libffi | ||
5 | |||
6 | FFI_LIBRARY_PATH is the full path to libffi so when building something that links to | ||
7 | libLLVMInterpreter, we were looking for libffi in clang's recipe-sysroot instead of | ||
8 | the recipe's sysroot. | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt | ||
16 | index b8adea5..7d8434c 100644 | ||
17 | --- a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt | ||
18 | +++ b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt | ||
19 | @@ -16,5 +16,5 @@ add_llvm_component_library(LLVMInterpreter | ||
20 | ) | ||
21 | |||
22 | if( LLVM_ENABLE_FFI ) | ||
23 | - target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} ) | ||
24 | + target_link_libraries( LLVMInterpreter PRIVATE ffi ) | ||
25 | endif() | ||
26 | -- | ||
27 | 2.7.4 | ||
28 | |||
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index c45e24c..2e82343 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc | |||
@@ -31,6 +31,7 @@ SRC_URI = "\ | |||
31 | file://0021-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \ | 31 | file://0021-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \ |
32 | file://0022-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch \ | 32 | file://0022-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch \ |
33 | file://0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch \ | 33 | file://0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch \ |
34 | file://0024-fix-path-to-libffi.patch \ | ||
34 | " | 35 | " |
35 | 36 | ||
36 | # Fallback to no-PIE if not set | 37 | # Fallback to no-PIE if not set |