[bug#74689] [PATCH 1/3] Partial revert "gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd."

[Janneke Nieuwenhuizen]

Zheng Junjie writes:

Hello Zheng,

> This reverts commit ec8a5ec15f898e864705e5a5c834532e3fa8d0a4.
>
> This part accidentally triggered a world rebuild for non-x86 architectures.
>
> Change-Id: Id2f9bcbcda8dc86ea407e9a7857a854dc1a742b5
> ---
>  gnu/packages/make-bootstrap.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
> index e0dcca7b33e..d9c2f9bb827 100644
> --- a/gnu/packages/make-bootstrap.scm
> +++ b/gnu/packages/make-bootstrap.scm
> @@ -538,7 +538,8 @@ (define %gcc-static
>                  (substitute* (cons "gcc/config/rs6000/sysv4.h"
>                                     (find-files "gcc/config"
>                                                 "^gnu-user.*\\.h$"))
> -                  ((" -lgcc_s}}") "}}"))))))))
> +                  ((" -lgcc_s}}") "}}")
> +                  #t)))))))

Running

--8<---------------cut here---------------start------------->8---
./pre-inst-env guix build --target=x86_64-pc-gnu bootstrap-tarballs 
--verbosity=2
--8<---------------cut here---------------end--------------->8---

gives:

--8<---------------cut here---------------start------------->8---
/gnu/store/9qy13rlkrl9q7wpkvbvz9bi89z4d9csq-gcc-static-14.2.0-builder:1:8712: 
source expression failed to match any pattern in form (substitute* (cons 
"gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")) ((" 
-lgcc_s}}") "}}") #t)
--8<---------------cut here---------------end--------------->8---

The fix is trivial, the #t needs to go one level up....but it makes me
wonder: have you tested this patch, I'm wondering as to how this worked
to avoid a world rebuild to you?

Thanks for looking into this, I couldn't have imagined touching
make-bootstrap.scm would trigger world rebuilds.

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com