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/base.scm | |
| parent | d501fad11cfbd69245a4d5e2d632a0ab37985b55 (diff) | |
| download | gnu-guix-56c092ce94cee893898f71ce61e443dd121cccdb.tar gnu-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/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 85380549ff..95052775c5 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -293,9 +293,7 @@ The tools supplied with this package are: (substitute* (find-files "tests" "\\.sh$") (("#!/bin/sh") (format #f "#!~a/bin/bash" bash))))) - ,(if (%current-target-system) - '%standard-cross-phases - '%standard-phases)))) + %standard-phases))) (synopsis "Core GNU utilities (file, text, shell)") (description "The GNU Core Utilities are the basic file, shell and text manipulation |