From 52dc0273759daaf167bf38656bab5cb2da27028f Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Thu, 16 Apr 2020 16:22:38 +0800 Subject: opencl-clang: fix runtime error Error log: clang (LLVM option parsing): Unknown command line argument '-pgo-warn-misexpect'. Try: 'clang (LLVM option parsing) --help' Force opencl-clang to link with shared clang-cpp for target builds and explicitly link with spirv library because of a change in behaviour in llvm 10. Use the patch to link with all static libs only for native cases where meta-clang default to building static libs only by default. Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- ...nly-static-libraries-linked-for-native-bu.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-make-sure-only-static-libraries-linked-for-native-bu.patch (limited to 'dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-make-sure-only-static-libraries-linked-for-native-bu.patch') diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-make-sure-only-static-libraries-linked-for-native-bu.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-make-sure-only-static-libraries-linked-for-native-bu.patch new file mode 100644 index 00000000..473f4d24 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0002-make-sure-only-static-libraries-linked-for-native-bu.patch @@ -0,0 +1,42 @@ +From b29e00e6fe428a031cf577dfb703cf13eff837f6 Mon Sep 17 00:00:00 2001 +From: Naveen Saini +Date: Wed, 15 Apr 2020 18:05:14 +0800 +Subject: [PATCH 2/2] make sure only static libraries linked for native build + +LINK_COMPONENTS=all isn't working for static libs for out of tree builds. Use +LLVM_AVAILABLE_LIBS instead. Reported: + +https://github.com/intel/opencl-clang/issues/114 + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal +Signed-off-by: Naveen Saini +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8707487..ad2dbda 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -218,7 +218,7 @@ add_subdirectory(cl_headers) + + set(LLVM_REQUIRES_EH ON) + +-if(USE_PREBUILT_LLVM OR CLANG_LINK_CLANG_DYLIB) ++if(false) + list(APPEND OPENCL_CLANG_LINK_LIBS clang-cpp) + else() + list(APPEND OPENCL_CLANG_LINK_LIBS +@@ -266,6 +266,7 @@ add_llvm_library(${TARGET_NAME} SHARED + all + LINK_LIBS + ${OPENCL_CLANG_LINK_LIBS} ++ ${LLVM_AVAILABLE_LIBS} + ) + + # Configure resource file on Windows +-- +2.17.1 + -- cgit v1.2.3-54-g00ecf