mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 21:09:03 +02:00
d9d4392e66
Include the latest changes from ocl-open-150 branch. Backport fixes from main and include another patch to fix issues with building target binaries. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From c2481fb3c7890302db5ee326ad9807155a2a2188 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
|
|
Date: Fri, 21 Apr 2023 04:07:21 +0200
|
|
Subject: [PATCH 1/2] Fix standalone build (#415)
|
|
|
|
Fixes https://github.com/intel/opencl-clang/issues/406
|
|
Fixes https://github.com/intel/opencl-clang/issues/374
|
|
|
|
Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/529a9188114bcbd8ed753d2276942384fa50d7a1]
|
|
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
|
|
---
|
|
cl_headers/CMakeLists.txt | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
|
|
index 69cf11e..18296c2 100644
|
|
--- a/cl_headers/CMakeLists.txt
|
|
+++ b/cl_headers/CMakeLists.txt
|
|
@@ -1,5 +1,9 @@
|
|
set(CL_HEADERS_LIB cl_headers)
|
|
-set(CLANG_COMMAND $<TARGET_FILE:clang> )
|
|
+if(USE_PREBUILT_LLVM)
|
|
+ find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)
|
|
+else()
|
|
+ set(CLANG_COMMAND $<TARGET_FILE:clang>)
|
|
+endif()
|
|
if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
|
|
build_native_tool(clang CLANG_COMMAND)
|
|
endif()
|
|
--
|
|
2.37.3
|
|
|