ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 07:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile: Fix cross-compilation.

Browse source 
Fixes a regression introduced in
d427ec4038, which changed the label of
Bash from "bash" to "bash-minimal" when cross-compiling.

* gnu/packages/guile.scm (guile-2.0)[arguments]: In 'pre-configure'
phase, use 'search-input-file' when (%current-target-system) is true.
This commit is contained in:
Ludovic Courtès 2023-03-03 23:32:52 +01:00
parent 0aed5bf512
commit f14ead765b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/guile.scm
View file

@ -218,17 +218,21 @@ (define-public guile-2.0
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Tell (ice-9 popen) the file name of Bash. ;; Tell (ice-9 popen) the file name of Bash.
;; TODO: On the next rebuild cycle, unconditionally use
;; 'search-input-file' instead of 'assoc-ref'.
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
(substitute* "module/ice-9/popen.scm" (substitute* "module/ice-9/popen.scm"
;; If bash is #f allow fallback for user to provide ;; If bash is #f allow fallback for user to provide
;; "bash" in PATH. This happens when cross-building to ;; "bash" in PATH. This happens when cross-building to
;; MinGW for which we do not have Bash yet. ;; MinGW for which we do not have Bash yet.
(("/bin/sh") (("/bin/sh")
,@(if (target-mingw?) ,(cond ((target-mingw?)
'((if bash "bash")
(string-append bash "/bin/bash") ((%current-target-system)
"bash")) '(search-input-file inputs "/bin/bash"))
'((string-append bash "/bin/bash"))))) (else
'(string-append bash "/bin/bash")))))
#t)))))) #t))))))
(native-search-paths (native-search-paths