diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2016-04-24 14:06:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-07 10:23:17 +0100 |
| commit | 88da729ff78676c61a225956af92d2c8e95b7643 (patch) | |
| tree | 1fd26313548092518a9e7f6f957f849820b32c31 | |
| parent | ae12d586275cdd96db23fb01bf840b2055b5b979 (diff) | |
| download | guix-88da729ff78676c61a225956af92d2c8e95b7643.tar guix-88da729ff78676c61a225956af92d2c8e95b7643.tar.gz | |
gnu: guile-2.0: support mingw.
* gnu/packages/guile.scm (guile-2.0): Support MinGW.
| -rw-r--r-- | gnu/packages/guile.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4572544ec3..1c1b35c34b 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -146,8 +146,8 @@ without requiring the source code to be rewritten.") (native-inputs `(("pkgconfig" ,pkg-config))) (inputs `(("libffi" ,libffi) ("readline" ,readline) - ("bash" ,bash))) - + ,@(libiconv-if-needed) + ,@(if (target-mingw?) '() `(("bash" ,bash))))) (propagated-inputs `( ;; These ones aren't normally needed here, but since `libguile-2.0.la' ;; reads `-lltdl -lunistring', adding them here will add the needed @@ -176,8 +176,15 @@ without requiring the source code to be rewritten.") ;; Tell (ice-9 popen) the file name of Bash. (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") - (string-append bash "/bin/bash"))))) + ,@(if (target-mingw?) + '((if bash + (string-append bash "/bin/bash") + "bash")) + '((string-append bash "/bin/bash"))))))) %standard-phases))) (native-search-paths |