diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-05-24 20:15:28 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-26 08:14:49 -0700 |
commit | 4e63e15e7fc33f3e25b5ec863e492c0535086947 (patch) | |
tree | 3fb7bc47766ae996a0643f4c6909323644a6dd87 | |
parent | ee99af13fd487f12cceef66e901ebd2b58baa8ed (diff) | |
download | meta-clang-4e63e15e7fc33f3e25b5ec863e492c0535086947.tar.gz |
Fix incorrect task dependencies from ${B}
Some tasks may reference ${B} for llvm-source which in general would not exist.
It has dependencies on HOST_SYS and TARGET_SYS which are not appropriate for a
shared recipe like llvm-source. This causes problems for the archiver and
multiconfigs in particlar.
Set B to something else to avoid these task hash issues.
Fixes issues #885
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-devtools/clang/common.inc | 2 | ||||
-rw-r--r-- | recipes-devtools/clang/llvm-project-source.inc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index 0766c0d..07f84f8 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc | |||
@@ -50,7 +50,7 @@ SRC_URI = "\ | |||
50 | GCCPIE ??= "" | 50 | GCCPIE ??= "" |
51 | 51 | ||
52 | S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/llvm-project-${PV}.src" | 52 | S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/llvm-project-${PV}.src" |
53 | B = "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 53 | B ?= "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}" |
54 | 54 | ||
55 | # We need to ensure that for the shared work directory, the do_patch signatures match | 55 | # We need to ensure that for the shared work directory, the do_patch signatures match |
56 | # The real WORKDIR location isn't a dependency for the shared workdir. | 56 | # The real WORKDIR location isn't a dependency for the shared workdir. |
diff --git a/recipes-devtools/clang/llvm-project-source.inc b/recipes-devtools/clang/llvm-project-source.inc index 84d827c..50e9154 100644 --- a/recipes-devtools/clang/llvm-project-source.inc +++ b/recipes-devtools/clang/llvm-project-source.inc | |||
@@ -25,6 +25,8 @@ TARGET_OS = "linux" | |||
25 | baselib = "lib" | 25 | baselib = "lib" |
26 | PACKAGE_ARCH = "all" | 26 | PACKAGE_ARCH = "all" |
27 | 27 | ||
28 | B = "${WORKDIR}/build" | ||
29 | |||
28 | # space separated list of additional distro vendor values we want to support e.g. | 30 | # space separated list of additional distro vendor values we want to support e.g. |
29 | # "yoe webos" or "-yoe -webos" '-' is optional | 31 | # "yoe webos" or "-yoe -webos" '-' is optional |
30 | CLANG_EXTRA_OE_VENDORS ?= "${TARGET_VENDOR} ${SDK_VENDOR}" | 32 | CLANG_EXTRA_OE_VENDORS ?= "${TARGET_VENDOR} ${SDK_VENDOR}" |