Author: ludo
Date: Thu Jul 15 14:06:09 2010
New Revision: 22610
URL: https://svn.nixos.org/websvn/nix/?rev=22610&sc=1
Log:
GCC 4.5: Fix libpthread-related `LIB_SPEC' on GNU.
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix
nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Thu Jul
15 13:28:36 2010 (r22609)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Thu Jul
15 14:06:09 2010 (r22610)
@@ -283,7 +283,7 @@
if cross != null && libcCross != null
then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
(optionalString (libpthreadCross != null)
- " -L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}")
+ " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
else null;
passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
Modified: nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix Thu Jul 15
13:28:36 2010 (r22609)
+++ nixpkgs/trunk/pkgs/os-specific/gnu/libpthread/default.nix Thu Jul 15
14:06:09 2010 (r22610)
@@ -56,10 +56,12 @@
passthru = {
# Extra target LDFLAGS to allow the cross-linker to find the
# dependencies of the cross libpthread.so, namely libihash.so.
+ # Note: these are raw `ld' flags, so `-Wl,' must be prepended when using
+ # `gcc'.
#
# This is actually only useful while building the final cross-gcc, since
# afterwards gcc-cross-wrapper should add the relevant flags.
- TARGET_LDFLAGS = "-Wl,-rpath-link=${hurd}/lib";
+ TARGET_LDFLAGS = "-rpath-link=${hurd}/lib";
};
}
else { }))
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
