diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-01-26 22:14:38 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-01-26 23:22:34 +0100 |
| commit | c2b40b4b4c9e0227e47730ebe73a653b89d1e568 (patch) | |
| tree | 20e72fea52b41f0a83c25e96e128b3d71995f099 /gnu/packages/make-bootstrap.scm | |
| parent | c6ec9c7af9814f84f293f62235eab9d0649751a7 (diff) | |
gnu: guile-static: Use 'gcc-ar' and 'gcc-ranlib'.
Fixes a regression introduced in
0e480ca7b60428a62fc4681d7aca6c7c067add42 whereby '%guile-static-3.0'
would fail to build with "undefined reference" errors at link time.
Fixes <https://issues.guix.gnu.org/61080>.
Reported by Hilton Chain <hako@ultrarare.space>.
* gnu/packages/make-bootstrap.scm (make-guile-static): Pass 'AR' and
'RANLIB' as #:configure-flags.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index a0999cb477c..51b2cb32672 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012-2021, 2023 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il> | 3 | ;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il> |
| 4 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 4 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| 5 | ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org> | 5 | ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org> |
| @@ -706,6 +706,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 706 | ;; doesn't try to link using libtool, and thus fails | 706 | ;; doesn't try to link using libtool, and thus fails |
| 707 | ;; because of a missing -ldl. Work around that. | 707 | ;; because of a missing -ldl. Work around that. |
| 708 | `(list "LDFLAGS=-ldl" "--enable-mini-gmp" | 708 | `(list "LDFLAGS=-ldl" "--enable-mini-gmp" |
| 709 | |||
| 710 | ;; Guile does an LTO build by default, but in 3.0.9 it | ||
| 711 | ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around | ||
| 712 | ;; it (see <https://issues.guix.gnu.org/61086>). | ||
| 713 | ,@(if (version-prefix? "3.0" (package-version guile)) | ||
| 714 | '("AR=gcc-ar" "RANLIB=gcc-ranlib") | ||
| 715 | '()) | ||
| 716 | |||
| 709 | ,@(if (hurd-target?) | 717 | ,@(if (hurd-target?) |
| 710 | '("--disable-jit") | 718 | '("--disable-jit") |
| 711 | '()))) | 719 | '()))) |
