Author: viric
Date: Mon Aug  2 22:44:41 2010
New Revision: 22912
URL: https://svn.nixos.org/websvn/nix/?rev=22912&sc=1

Log:
Fixing the dynamic linker in the gcc-cross-wrapper so it takes also the dynamic
linker of glibc on mips (specifically ld.so.1, and not ld-*.so.? as we had 
before)

Modified:
   nixpkgs/trunk/pkgs/build-support/gcc-cross-wrapper/builder.sh

Modified: nixpkgs/trunk/pkgs/build-support/gcc-cross-wrapper/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/gcc-cross-wrapper/builder.sh       Mon Aug 
 2 22:26:04 2010        (r22911)
+++ nixpkgs/trunk/pkgs/build-support/gcc-cross-wrapper/builder.sh       Mon Aug 
 2 22:44:41 2010        (r22912)
@@ -8,7 +8,7 @@
     cflagsCompile="$cflagsCompile -B$libc/lib/ -isystem $libc/include"
     ldflags="$ldflags -L$libc/lib"
     # Get the proper dynamic linker for glibc and uclibc. 
-    dlinker=`eval 'echo $libc/lib/ld-*.so.?'`
+    dlinker=`eval 'echo $libc/lib/ld*.so.?'`
     if [ -n "$dlinker" ]; then
       ldflagsBefore="-dynamic-linker $dlinker"
     fi
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to