diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index a6079553cc..a09363a855 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -405,6 +405,12 @@ (define %gcc-static ((#:implicit-inputs? _) #t) ((#:configure-flags flags) `(append (list + ;; We don't need a full bootstrap here. + "--disable-bootstrap" + + ;; Make sure '-static' is passed where it matters. + "--with-stage1-ldflags=-static" + "--disable-shared" "--disable-plugin" "--enable-languages=c" @@ -417,11 +423,7 @@ (define %gcc-static "--disable-libquadmath" "--disable-decimal-float") (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags))) - ((#:make-flags flags) - (if (%current-target-system) - `(cons "LDFLAGS=-static" ,flags) - `(cons "BOOT_LDFLAGS=-static" ,flags)))))) + ,flags)))))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both