From ed141a08b3e7785142c9889177fadc65d4f583ef Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 23 Mar 2020 11:35:59 +0800 Subject: 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 --- .../clang/files/fix-shared-libs.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch (limited to 'dynamic-layers/clang-layer/recipes-devtools/clang/files/fix-shared-libs.patch') 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 @@ +From a6d4ccf082858e63e139ca06c02a071c343d2657 Mon Sep 17 00:00:00 2001 +From: Andrea Bocci +Date: Sun, 15 Mar 2020 17:35:44 +0100 +Subject: [PATCH] Fix building in-tree with cmake -DLLVM_LINK_LLVM_DYLIB=ON + +Building in-tree with LLVM 11.0 master with the LLVM_LINK_LLVM_DYLIB +cmake flag fails to link with the LLVMSPIRVLib library. + +Add an explicit dependency to force the correct build order and linking. + +Signed-off-by: Andrea Bocci +Upstream-Status: Backport +Signed-off-by: Anuj Mittal +--- + tools/llvm-spirv/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/llvm-spirv/CMakeLists.txt b/tools/llvm-spirv/CMakeLists.txt +index 9aa96d9c..501c0daf 100644 +--- a/tools/llvm-spirv/CMakeLists.txt ++++ b/tools/llvm-spirv/CMakeLists.txt +@@ -14,7 +14,7 @@ add_llvm_tool(llvm-spirv + NO_INSTALL_RPATH + ) + +-if (LLVM_SPIRV_BUILD_EXTERNAL) ++if (LLVM_SPIRV_BUILD_EXTERNAL OR LLVM_LINK_LLVM_DYLIB) + target_link_libraries(llvm-spirv PRIVATE LLVMSPIRVLib) + endif() + -- cgit v1.2.3-54-g00ecf