From 4e63e15e7fc33f3e25b5ec863e492c0535086947 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 24 May 2024 20:15:28 -0700 Subject: [PATCH] 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 --- recipes-devtools/clang/common.inc | 2 +- recipes-devtools/clang/llvm-project-source.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index 0766c0de..07f84f82 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc @@ -50,7 +50,7 @@ SRC_URI = "\ GCCPIE ??= "" S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/llvm-project-${PV}.src" -B = "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}" +B ?= "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}" # We need to ensure that for the shared work directory, the do_patch signatures match # 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 84d827c0..50e9154e 100644 --- a/recipes-devtools/clang/llvm-project-source.inc +++ b/recipes-devtools/clang/llvm-project-source.inc @@ -25,6 +25,8 @@ TARGET_OS = "linux" baselib = "lib" PACKAGE_ARCH = "all" +B = "${WORKDIR}/build" + # space separated list of additional distro vendor values we want to support e.g. # "yoe webos" or "-yoe -webos" '-' is optional CLANG_EXTRA_OE_VENDORS ?= "${TARGET_VENDOR} ${SDK_VENDOR}"