gnu: nspr: Adjust to Mozilla cross-compilation conventions.
* gnu/packages/nss.scm (nspr)[arguments]<#:configure-flags>: Set --host and --target inappropriately when cross-compiling.
This commit is contained in:
parent
5fc78abc7f
commit
1d3cb21853
|
@ -6,6 +6,7 @@
|
||||||
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
|
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
|
||||||
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
|
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -51,11 +52,20 @@ (define-public nspr
|
||||||
`(("perl" ,perl)))
|
`(("perl" ,perl)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:tests? #f ; no check target
|
`(#:tests? #f ; no check target
|
||||||
#:configure-flags (list "--disable-static"
|
#:configure-flags
|
||||||
"--enable-64bit"
|
(list "--disable-static"
|
||||||
(string-append "LDFLAGS=-Wl,-rpath="
|
"--enable-64bit"
|
||||||
(assoc-ref %outputs "out")
|
(string-append "LDFLAGS=-Wl,-rpath="
|
||||||
"/lib"))
|
(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.
|
;; Use fixed timestamps for reproducibility.
|
||||||
#:make-flags '("SH_DATE='1970-01-01 00:00:01'"
|
#:make-flags '("SH_DATE='1970-01-01 00:00:01'"
|
||||||
;; This is epoch 1 in microseconds.
|
;; This is epoch 1 in microseconds.
|
||||||
|
|
Loading…
Reference in a new issue