diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-06-26 16:27:51 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-06-26 16:27:51 +0200 |
| commit | e7133c76802991f8da2afd87eed598f5ca00a082 (patch) | |
| tree | 600806c29ba71502e36c0669b07b08e927b43e47 /gnu/packages/bootstrap.scm | |
| parent | c8fa51f2d6dd8ab9157f8c87b909f73b956371d1 (diff) | |
| download | guix-patches-e7133c76802991f8da2afd87eed598f5ca00a082.tar guix-patches-e7133c76802991f8da2afd87eed598f5ca00a082.tar.gz | |
gnu: cross-base: Make `glibc-dynamic-linker' do the right thing.
* gnu/packages/bootstrap.scm (glibc-dynamic-linker): Determine SYSTEM
based on (%current-target-system) when it's true.
* gnu/packages/cross-base.scm (cross-gcc): Directly call
(package-arguments gcc-4.7) from the body of `arguments'.
Diffstat (limited to 'gnu/packages/bootstrap.scm')
| -rw-r--r-- | gnu/packages/bootstrap.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index eaad45a741..86723a9591 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -131,7 +131,10 @@ check whether everything is alright." (propagated-inputs (map rewritten-input (package-propagated-inputs p))))))) -(define* (glibc-dynamic-linker #:optional (system (%current-system))) +(define* (glibc-dynamic-linker + #:optional (system (or (and=> (%current-target-system) + gnu-triplet->nix-system) + (%current-system)))) "Return the name of Glibc's dynamic linker for SYSTEM." (cond ((string=? system "x86_64-linux") "/lib/ld-linux-x86-64.so.2") ((string=? system "i686-linux") "/lib/ld-linux.so.2") |