diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-08-08 09:28:33 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-08-08 09:31:23 +0000 |
| commit | e30c3f6e41d5754c0544c6a5eaa8643173ea51d6 (patch) | |
| tree | 155b0c05ed535583ab13370821d297336847b7bc /tcwg_bmk-build.sh | |
| parent | 0b55ca0d89d49696e9e68b35fc4ccfd97eb16397 (diff) | |
tcwg_gnu-build.sh: Clean sysroot when re-building linux headers or glibc
Change-Id: I6a3b8ba5552fb82762d7ef72a4d3202dd37ffc8a
Diffstat (limited to 'tcwg_bmk-build.sh')
| -rwxr-xr-x | tcwg_bmk-build.sh | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index b5b6baaf..6bd60a12 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -152,8 +152,7 @@ case "${rr[mode]}" in case $single_updated_component in binutils) default_start_at="build_abe-binutils" ;; gcc) default_start_at="build_abe-stage1" ;; - linux) default_start_at="build_abe-linux" ;; - glibc) default_start_at="clean_sysroot" ;; + linux|glibc) default_start_at="clean_sysroot" ;; llvm) default_start_at="build_llvm-true" ;; newlib) default_start_at="build_abe-newlib" ;; *) assert_with_msg \ @@ -173,24 +172,6 @@ fi run_step_init "$start_at" "$finish_at" "${rr[top_artifacts]}" "$verbose" -# If we bisect a regression between different major versions of Glibc, -# then we might get a mixed sysroot with several versions of ld-M.N.so and -# other binaries installed side-by-side. Such a sysroot will break -# benchmarking, which requires a single ld-*.so binary to be present. -# Forcefully delete sysroot before building C library. -clean_sysroot () -{ - ( - set -euf -o pipefail - - local gnu_target sysroot - gnu_target=$(print_gnu_target ${rr[target]}) - sysroot="$(pwd)/abe/builds/destdir/x86_64-pc-linux-gnu/$gnu_target/libc" - - rm -rf "$sysroot" - ) -} - benchmark () { ( |