Author: ludo
Date: Sun Jun 12 22:32:44 2011
New Revision: 27428
URL: https://svn.nixos.org/websvn/nix/?rev=27428&sc=1
Log:
Specify the dynamic linker name for cross-compilation to GNU/Hurd.
Modified:
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix
Modified: nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix Sun Jun 12
21:53:56 2011 (r27427)
+++ nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix Sun Jun 12
22:32:44 2011 (r27428)
@@ -64,9 +64,10 @@
# This is not the best way to do this. I think the reference should be
# the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
# do this sufficient if/else.
- dynamicLinker =
+ dynamicLinker =
(if stdenv.cross.arch == "arm" then "ld-linux.so.3" else
if stdenv.cross.arch == "mips" then "ld.so.1" else
+ if stdenv.lib.hasSuffix "pc-gnu" cross.config then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform");
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
