futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: glibc: Fix cross-compilation regression.

Browse Source 
Fixes a regression introduced in 12b0dbd.
See <http://lists.gnu.org/archive/html/guix-devel/2015-03/msg00698.html>.

* gnu/packages/base.scm (glibc)[arguments] <pre-configure>: Add
  #:native-inputs parameter.  Look up "static-bash" first in INPUTS,
  then in NATIVE-INPUTS.
This commit is contained in:
Ludovic Courtès 2015-03-26 23:09:35 +01:00
parent 12b0dbd472
commit 6170834d47
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/base.scm
View File

@ -431,7 +431,8 @@ included.")
#:tests? #f ; XXX #:tests? #f ; XXX
#:phases (alist-cons-before #:phases (alist-cons-before
'configure 'pre-configure 'configure 'pre-configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs native-inputs outputs
#:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
;; Use `pwd', not `/bin/pwd'. ;; Use `pwd', not `/bin/pwd'.
@ -455,8 +456,13 @@ included.")
;; Copy a statically-linked Bash in the output, with ;; Copy a statically-linked Bash in the output, with
;; no references to other store paths. ;; no references to other store paths.
;; FIXME: Normally we would look it up only in INPUTS but
;; cross-base uses it as a native input.
(mkdir-p bin) (mkdir-p bin)
(copy-file (string-append (assoc-ref inputs "static-bash") (copy-file (string-append (or (assoc-ref inputs
"static-bash")
(assoc-ref native-inputs
"static-bash"))
"/bin/bash") "/bin/bash")
(string-append bin "/bash")) (string-append bin "/bash"))
(remove-store-references (string-append bin "/bash")) (remove-store-references (string-append bin "/bash"))