diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-03-23 11:35:59 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-04 18:18:52 +0800 |
commit | ed141a08b3e7785142c9889177fadc65d4f583ef (patch) | |
tree | e8cf056de4469d35d2965a3b9ca4b79e0f435e3e /dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch | |
parent | 60df7066e5ff0d1c5569b6361c4d6435777464cb (diff) | |
download | meta-intel-ed141a08b3e7785142c9889177fadc65d4f583ef.tar.gz |
llvm-spirv: upgrade 9.0.0 -> 10.0.0
Remove patches that are present in this version of llvm and backport a
fix to prevent linking errors.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch')
-rw-r--r-- | dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch new file mode 100644 index 00000000..d69d2a97 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From a6d4ccf082858e63e139ca06c02a071c343d2657 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrea Bocci <andrea.bocci@cern.ch> | ||
3 | Date: Sun, 15 Mar 2020 17:35:44 +0100 | ||
4 | Subject: [PATCH] Fix building in-tree with cmake -DLLVM_LINK_LLVM_DYLIB=ON | ||
5 | |||
6 | Building in-tree with LLVM 11.0 master with the LLVM_LINK_LLVM_DYLIB | ||
7 | cmake flag fails to link with the LLVMSPIRVLib library. | ||
8 | |||
9 | Add an explicit dependency to force the correct build order and linking. | ||
10 | |||
11 | Signed-off-by: Andrea Bocci <andrea.bocci@cern.ch> | ||
12 | Upstream-Status: Backport | ||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | tools/llvm-spirv/CMakeLists.txt | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/tools/llvm-spirv/CMakeLists.txt b/tools/llvm-spirv/CMakeLists.txt | ||
19 | index 9aa96d9c..501c0daf 100644 | ||
20 | --- a/tools/llvm-spirv/CMakeLists.txt | ||
21 | +++ b/tools/llvm-spirv/CMakeLists.txt | ||
22 | @@ -14,7 +14,7 @@ add_llvm_tool(llvm-spirv | ||
23 | NO_INSTALL_RPATH | ||
24 | ) | ||
25 | |||
26 | -if (LLVM_SPIRV_BUILD_EXTERNAL) | ||
27 | +if (LLVM_SPIRV_BUILD_EXTERNAL OR LLVM_LINK_LLVM_DYLIB) | ||
28 | target_link_libraries(llvm-spirv PRIVATE LLVMSPIRVLib) | ||
29 | endif() | ||
30 | |||