diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2021-03-03 08:01:54 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-03-05 15:31:23 -0800 |
commit | 3fbc916a7987f15f874f40f9e5b531eb72bffc7a (patch) | |
tree | 08bee8fd8b7f0c720da4e0d22410c6bc55159f9d /recipes-devtools/spirv-llvm-translator | |
parent | f6e8b41b291d69754356a6c4915e5daa1af59de4 (diff) | |
download | meta-clang-3fbc916a7987f15f874f40f9e5b531eb72bffc7a.tar.gz |
spirv-llvm-translator: disable ccache
Native build is failing, error log:
~/build/tmp/work/x86_64-linux/spirv-llvm-translator-native/12.0.0-r0/git/lib/SPIRV/SPIRVLowerSPIRBlocks.cpp
| /bin/sh: 1: ccache: not found
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Diffstat (limited to 'recipes-devtools/spirv-llvm-translator')
-rw-r--r-- | recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch | 32 | ||||
-rw-r--r-- | recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb | 2 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch new file mode 100644 index 0000000..68cdda4 --- /dev/null +++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 13b679eb76e6877b40fd41b91e71cb172bcf7b26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Thu, 4 Mar 2021 11:23:20 +0800 | ||
4 | Subject: [PATCH] cmake: allow to enable/disable ccache | ||
5 | |||
6 | By default ccache is enabled. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/930] | ||
9 | |||
10 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 0ddb55c..c7d0498 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -50,8 +50,9 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) | ||
20 | |||
21 | message(STATUS "Found LLVM: ${LLVM_VERSION}") | ||
22 | |||
23 | + option(CCACHE_ALLOWED "allow use of ccache" TRUE) | ||
24 | find_program(CCACHE_EXE_FOUND ccache) | ||
25 | - if(CCACHE_EXE_FOUND) | ||
26 | + if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED) | ||
27 | message(STATUS "Found ccache: ${CCACHE_EXE_FOUND}") | ||
28 | set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) | ||
29 | set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) | ||
30 | -- | ||
31 | 2.17.1 | ||
32 | |||
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb index a7b5580..171d54f 100644 --- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb +++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb | |||
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d" | |||
4 | BRANCH = "llvm_release_120" | 4 | BRANCH = "llvm_release_120" |
5 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \ | 5 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \ |
6 | file://0001-Use-12.0.0-for-base-llvm-version.patch \ | 6 | file://0001-Use-12.0.0-for-base-llvm-version.patch \ |
7 | file://0001-cmake-allow-to-enable-disable-ccache.patch \ | ||
7 | " | 8 | " |
8 | 9 | ||
9 | PV = "12.0.0" | 10 | PV = "12.0.0" |
@@ -27,6 +28,7 @@ EXTRA_OECMAKE = "\ | |||
27 | -DLLVM_EXTERNAL_LIT=lit \ | 28 | -DLLVM_EXTERNAL_LIT=lit \ |
28 | -DLLVM_INCLUDE_TESTS=ON \ | 29 | -DLLVM_INCLUDE_TESTS=ON \ |
29 | -Wno-dev \ | 30 | -Wno-dev \ |
31 | -DCCACHE_ALLOWED=FALSE \ | ||
30 | " | 32 | " |
31 | 33 | ||
32 | do_compile_append() { | 34 | do_compile_append() { |