diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-21 00:25:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-21 00:25:54 +0200 |
| commit | 56c092ce94cee893898f71ce61e443dd121cccdb (patch) | |
| tree | e0323ffa05b55605112e2ce46500ee13c7707a48 /gnu/packages/guile.scm | |
| parent | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (diff) | |
| download | guix-56c092ce94cee893898f71ce61e443dd121cccdb.tar.gz | |
build-system/gnu: Unify with (guix build-system gnu-cross-build).
* guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and `native-search-paths' keyword parameters. Honor them. (configure): Add `target' and `native-inputs' keyword parameters. Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET is true. (strip): Add `strip-command' keyword parameter. Use it. * guix/build/gnu-cross-build.scm: Remove. * Makefile.am (MODULES): Adjust accordingly. * gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm, gnu/packages/bash.scm, gnu/packages/gawk.scm, gnu/packages/gettext.scm, gnu/packages/guile.scm, gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm, gnu/packages/linux.scm, gnu/packages/ncurses.scm, gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace `%standard-cross-phases' by `%standard-phases'. Remove references to (guix build gnu-cross-build).
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b53f3eb770..c4eca3e350 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -158,9 +158,7 @@ extensible. It supports many SRFIs.") (substitute* "module/ice-9/popen.scm" (("/bin/sh") (string-append bash "/bin/bash"))))) - ,(if (%current-target-system) - '%standard-cross-phases - '%standard-phases)) + %standard-phases) ,@(if (%current-target-system) '(#:configure-flags '("CC_FOR_BUILD=gcc")) |