From dc9e6778999ba309313d8c8cc158eaa08fa33af8 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Mon, 16 Aug 2021 11:33:38 +0000 Subject: tcwg_gnu-build.sh: Don't do 2-stage GCC build in native configurations There's no benefit in building 1st stage of GCC in native configurations. Change-Id: Ief5bcbaa841121ea4a7628dfaf7af6ce481fdce3 --- tcwg_gnu-build.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index 67330d3d..8fb07f81 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -86,7 +86,7 @@ case "${rr[mode]}" in case "$(print_single_updated_component):${rr[ci_project]}" in binutils:*) default_start_at="build_abe-binutils" ;; gcc:tcwg_gnu_cross_*) default_start_at="build_abe-stage1" ;; - gcc:tcwg_gnu_native_*) default_start_at="build_abe-stage1" ;; + gcc:tcwg_gnu_native_*) default_start_at="build_abe-gcc" ;; gcc:tcwg_gcc_check) default_start_at="build_abe-gcc" ;; gcc:tcwg_gcc_*bootstrap) default_start_at="build_abe-${type_of_test#check_}" ;; linux:*|glibc:*) default_start_at="clean_sysroot" ;; @@ -251,20 +251,18 @@ case "${rr[ci_project]}" in tcwg_gnu_native_build) run_step skip_on_fail 0 true run_step skip_on_fail 1 build_abe binutils - run_step skip_on_fail 2 build_abe stage1 + run_step skip_on_fail 2 build_abe gcc run_step skip_on_fail x clean_sysroot - run_step skip_on_fail 3 build_abe linux - run_step skip_on_fail 4 build_abe glibc - run_step skip_on_fail 5 build_abe stage2 + run_step skip_on_fail 4 build_abe linux + run_step skip_on_fail 5 build_abe glibc run_step skip_on_fail 6 build_abe gdb ;; tcwg_gnu_native_check_*) run_step skip_on_fail -8 build_abe binutils - run_step skip_on_fail -7 build_abe stage1 + run_step skip_on_fail -7 build_abe gcc run_step skip_on_fail x clean_sysroot - run_step skip_on_fail -6 build_abe linux - run_step skip_on_fail -5 build_abe glibc - run_step skip_on_fail -4 build_abe stage2 + run_step skip_on_fail -5 build_abe linux + run_step skip_on_fail -4 build_abe glibc run_step skip_on_fail -3 build_abe gdb run_step skip_on_fail 0 build_abe dejagnu run_step skip_on_fail 1 build_abe "${rr[ci_project]#tcwg_gnu_native_}" -- "${runtestflags[@]}" -- cgit v1.2.3