me
/
guix
Archived
1
0
Fork 0
Code

gnu: guile: Fix cross-compilation. 

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.
master
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 @@ without requiring the source code to be rewritten.")
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
;; 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")))
(substitute* "module/ice-9/popen.scm"
;; If bash is #f allow fallback for user to provide
;; "bash" in PATH. This happens when cross-building to
;; MinGW for which we do not have Bash yet.
(("/bin/sh")
,@(if (target-mingw?)
'((if bash
(string-append bash "/bin/bash")
"bash"))
'((string-append bash "/bin/bash")))))
,(cond ((target-mingw?)
"bash")
((%current-target-system)
'(search-input-file inputs "/bin/bash"))
(else
'(string-append bash "/bin/bash")))))
#t))))))
(native-search-paths