diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-05-26 18:16:47 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-27 08:37:41 -0700 |
commit | 3e80a43b13cbae6d69fa8ce45e075bf677877003 (patch) | |
tree | 1f8cf8a241df7394b6737580d9eb4835677ce6a1 /scripts/devtool-clang.sh | |
parent | 5545bb82ec861cc91cbd8ed340fa160e0613c800 (diff) | |
download | meta-clang-3e80a43b13cbae6d69fa8ce45e075bf677877003.tar.gz |
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 <raj.khem@gmail.com>
Diffstat (limited to 'scripts/devtool-clang.sh')
-rwxr-xr-x | scripts/devtool-clang.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/devtool-clang.sh b/scripts/devtool-clang.sh index 08f9214..be8359a 100755 --- a/scripts/devtool-clang.sh +++ b/scripts/devtool-clang.sh | |||
@@ -8,6 +8,10 @@ | |||
8 | layerloc="$(dirname "$0")/../conf/layer.conf" | 8 | layerloc="$(dirname "$0")/../conf/layer.conf" |
9 | workspace="$(dirname "$0")/../../../workspace" | 9 | workspace="$(dirname "$0")/../../../workspace" |
10 | 10 | ||
11 | # Change target and SDK host as needed | ||
12 | target=riscv64 | ||
13 | sdkhost=x86_64 | ||
14 | |||
11 | origver=$(grep "LLVMVERSION =" < "$layerloc" | awk '{print $3}' | tr -d '"') | 15 | origver=$(grep "LLVMVERSION =" < "$layerloc" | awk '{print $3}' | tr -d '"') |
12 | 16 | ||
13 | major=$(grep -e "set(LLVM_VERSION_MAJOR [0-9]" < "$workspace"/sources/llvm-project/cmake/Modules/LLVMVersion.cmake| cut -d ' ' -f 4 | sed "s/)//") | 17 | 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 | |||
17 | recipes="\ | 21 | recipes="\ |
18 | llvm-project-source-$origver \ | 22 | llvm-project-source-$origver \ |
19 | clang \ | 23 | clang \ |
20 | clang-cross-riscv64 \ | 24 | clang-cross-$target \ |
21 | clang-crosssdk-x86_64 \ | 25 | clang-crosssdk-$sdkhost \ |
22 | clang-cross-canadian-riscv64 \ | 26 | clang-cross-canadian-$target \ |
23 | nativesdk-clang-glue \ | 27 | nativesdk-clang-glue \ |
24 | compiler-rt \ | 28 | compiler-rt \ |
25 | compiler-rt-sanitizers \ | 29 | compiler-rt-sanitizers \ |
@@ -39,3 +43,6 @@ for f in "$workspace"/appends/*.bbappend; do | |||
39 | done | 43 | done |
40 | 44 | ||
41 | sed -i -e "s/$origver/$major.$minor.$patch/g" "$workspace"/appends/llvm-project-source.bbappend | 45 | sed -i -e "s/$origver/$major.$minor.$patch/g" "$workspace"/appends/llvm-project-source.bbappend |
46 | sed -i -e "s/:pn-clang-cross-$target//g" "$workspace"/appends/clang-cross_git.bbappend | ||
47 | sed -i -e "s/:pn-clang-cross-canadian-$target//g" "$workspace"/appends/clang-cross-canadian_git.bbappend | ||
48 | sed -i -e "s/:pn-clang-crosssdk-$sdkhost//g" "$workspace"/appends/clang-crosssdk_git.bbappend | ||