From e7133c76802991f8da2afd87eed598f5ca00a082 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Jun 2013 16:27:51 +0200 Subject: 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'. --- gnu/packages/bootstrap.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bootstrap.scm') 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 @@ (define rewritten-input (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") -- cgit v1.2.3