diff options
| author | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-10-03 16:52:42 +0200 |
|---|---|---|
| committer | Laurent Alfonsi <laurent.alfonsi@linaro.org> | 2022-10-04 10:24:58 +0200 |
| commit | 229670b3ecba1fd771945356aad2f6bf72f6b484 (patch) | |
| tree | c8e0dc39af2d6617006b6e4bec5561a63b47505c | |
| parent | 99cede4a3177b28ec0a8984831c364d56a1c59b3 (diff) | |
round-robin.sh,tcwg_bmk-build.sh: Can build llvm for flang
Change-Id: Ic97dd373bcc46b770cb73df2ff88379549bdf5f6
| -rw-r--r-- | round-robin.sh | 11 | ||||
| -rwxr-xr-x | tcwg_kernel-build.sh | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/round-robin.sh b/round-robin.sh index b12e3f49..0e77af92 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -601,8 +601,8 @@ build_llvm () set -euf -o pipefail local use_abe="${1-false}" - local extra_targets="${2-}" - local extra_projects="${3-}" + local build_llvm_flang="${2-false}" + local extra_targets="${3-}" clone_repo llvm wget -O llvm-vect-metric.diff "https://git.linaro.org/toolchain/jenkins-scripts.git/plain/downstream_patches/llvm-vect-metric.diff" @@ -657,15 +657,16 @@ EOF local llvm_targets llvm_targets="$(print_llvm_target ${rr[target]})${extra_targets}" - if [ x"$extra_projects" != x"" ]; then - extra_projects=";$extra_projects" + local llvm_enable_projects="clang;lld" + if $build_llvm_flang; then + llvm_enable_projects="${llvm_enable_projects};mlir;flang" fi rm -rf llvm-build mkdir -p llvm-build cd llvm-build - cmake -G Ninja ../llvm/llvm "-DLLVM_ENABLE_PROJECTS=clang;lld${extra_projects}" \ + cmake -G Ninja ../llvm/llvm "-DLLVM_ENABLE_PROJECTS=${llvm_enable_projects}" \ -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=True \ -DCMAKE_INSTALL_PREFIX=../llvm-install \ "-DLLVM_TARGETS_TO_BUILD=$llvm_targets" \ diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index 3c8a29c9..e7d403b4 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -100,7 +100,7 @@ build_kernel_llvm () extra_targets="$extra_targets;ARM" fi - build_llvm false "$extra_targets" + build_llvm false false "$extra_targets" ) } |