summary refs log tree commit diff
path: root/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-20 22:56:58 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-20 22:56:58 +0000
commita5fee3325a61b9ae33a0132a653d19079710002e (patch)
treefa8f99e4a6bc671a5fc0f2a9153d385d59b342be /pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
parentb27cf66ee28bc9fdec9a36fb00e019d5c0b57402 (diff)
downloadnixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar
nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.gz
nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.bz2
nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.lz
nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.xz
nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.tar.zst
nixlib-a5fee3325a61b9ae33a0132a653d19079710002e.zip
Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
Diffstat (limited to 'pkgs/build-support/gcc-cross-wrapper/setup-hook.sh')
-rw-r--r--pkgs/build-support/gcc-cross-wrapper/setup-hook.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
index 8edfa1ac92b1..81735a4feffe 100644
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
@@ -20,8 +20,11 @@ if test -n "@binutils@"; then
     PATH=$PATH:@binutils@/bin
 fi
 
-if test -n "@glibc@"; then
-    PATH=$PATH:@glibc@/bin
+if test -n "@libc@"; then
+    PATH=$PATH:@libc@/bin
+    addCVars @libc@
 fi
 
 configureFlags="$configureFlags --build=$system --host=$crossConfig"
+dontPatchELF=1
+dontStrip=1