diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-08-24 10:05:52 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-20 11:11:47 +0000 |
| commit | 1d3cb218531df00af48d6a38d57e5ed35df6eac3 (patch) | |
| tree | 98ce33b5980e3da7df21476b6e222f8d14b5850a | |
| parent | 5fc78abc7f8991ddda91c4a57a0701dd340e1027 (diff) | |
| download | guix-1d3cb218531df00af48d6a38d57e5ed35df6eac3.tar.gz | |
gnu: nspr: Adjust to Mozilla cross-compilation conventions.
* gnu/packages/nss.scm (nspr)[arguments]<#:configure-flags>: Set --host and --target inappropriately when cross-compiling.
| -rw-r--r-- | gnu/packages/nss.scm | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 55eddc0c91..6560aede56 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,11 +52,20 @@ `(("perl" ,perl))) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--disable-static" - "--enable-64bit" - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib")) + #:configure-flags + (list "--disable-static" + "--enable-64bit" + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + ;; Mozilla deviates from Autotools conventions + ;; due to historical reasons. Adjust to Mozilla conventions, + ;; otherwise the Makefile will try to use TARGET-gcc + ;; as a ‘native’ compiler. + ,@(if (%current-target-system) + `(,(string-append "--host=" + (nix-system->gnu-triplet (%current-system))) + ,(string-append "--target=" (%current-target-system))) + '())) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds. |