From 3e80a43b13cbae6d69fa8ce45e075bf677877003 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 26 May 2024 18:16:47 -0700 Subject: [PATCH] devtool-clang.sh: Widen EXTERNALSRC setting by removing overrides This helps in making it work on multiple architectures, we use same clang to build for these anyway so it just reflects the reality Signed-off-by: Khem Raj --- scripts/devtool-clang.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/devtool-clang.sh b/scripts/devtool-clang.sh index 08f9214f..be8359a7 100755 --- a/scripts/devtool-clang.sh +++ b/scripts/devtool-clang.sh @@ -8,6 +8,10 @@ layerloc="$(dirname "$0")/../conf/layer.conf" workspace="$(dirname "$0")/../../../workspace" +# Change target and SDK host as needed +target=riscv64 +sdkhost=x86_64 + origver=$(grep "LLVMVERSION =" < "$layerloc" | awk '{print $3}' | tr -d '"') major=$(grep -e "set(LLVM_VERSION_MAJOR [0-9]" < "$workspace"/sources/llvm-project/cmake/Modules/LLVMVersion.cmake| cut -d ' ' -f 4 | sed "s/)//") @@ -17,9 +21,9 @@ patch=$(grep -e "set(LLVM_VERSION_PATCH [0-9]" < "$workspace"/sources/llvm-proje recipes="\ llvm-project-source-$origver \ clang \ -clang-cross-riscv64 \ -clang-crosssdk-x86_64 \ -clang-cross-canadian-riscv64 \ +clang-cross-$target \ +clang-crosssdk-$sdkhost \ +clang-cross-canadian-$target \ nativesdk-clang-glue \ compiler-rt \ compiler-rt-sanitizers \ @@ -39,3 +43,6 @@ for f in "$workspace"/appends/*.bbappend; do done sed -i -e "s/$origver/$major.$minor.$patch/g" "$workspace"/appends/llvm-project-source.bbappend +sed -i -e "s/:pn-clang-cross-$target//g" "$workspace"/appends/clang-cross_git.bbappend +sed -i -e "s/:pn-clang-cross-canadian-$target//g" "$workspace"/appends/clang-cross-canadian_git.bbappend +sed -i -e "s/:pn-clang-crosssdk-$sdkhost//g" "$workspace"/appends/clang-crosssdk_git.bbappend