diff options
| author | Maxim Cournoyer <[email protected]> | 2023-02-08 09:41:45 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2023-02-08 09:41:45 -0500 |
| commit | d88cee1d44a475b6ea276e87a4c98682255b881e (patch) | |
| tree | f2e681b5211840d4eef688120041c2dd730002cc /gnu/packages/make-bootstrap.scm | |
| parent | d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d (diff) | |
| parent | 20059f92a97726b40d4d74e67463a64c98d1da0d (diff) | |
Merge branch 'master' into staging.
With conflicts resolved in:
gnu/packages/version-control.scm
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 a0999cb477..51b2cb3267 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <[email protected]> +;;; Copyright © 2012-2021, 2023 Ludovic Courtès <[email protected]> ;;; Copyright © 2017, 2021 Efraim Flashner <[email protected]> ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2018, 2019 Mark H Weaver <[email protected]> @@ -706,6 +706,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; doesn't try to link using libtool, and thus fails ;; because of a missing -ldl. Work around that. `(list "LDFLAGS=-ldl" "--enable-mini-gmp" + + ;; Guile does an LTO build by default, but in 3.0.9 it + ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around + ;; it (see <https://issues.guix.gnu.org/61086>). + ,@(if (version-prefix? "3.0" (package-version guile)) + '("AR=gcc-ar" "RANLIB=gcc-ranlib") + '()) + ,@(if (hurd-target?) '("--disable-jit") '()))) |