ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

GCC 4.5: Fix libpthread-related `LIB_SPEC' on GNU.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22610
This commit is contained in:
Ludovic Courtès 2010-07-15 14:06:09 +00:00
parent 5a028270aa
commit d88cd100c9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -283,7 +283,7 @@ stdenv.mkDerivation ({
if cross != null && libcCross != null if cross != null && libcCross != null
then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" + then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
(optionalString (libpthreadCross != null) (optionalString (libpthreadCross != null)
" -L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}") " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
else null; else null;
passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl

4
pkgs/os-specific/gnu/libpthread/default.nix
View File

@ -56,10 +56,12 @@ stdenv.mkDerivation ({
passthru = { passthru = {
# Extra target LDFLAGS to allow the cross-linker to find the # Extra target LDFLAGS to allow the cross-linker to find the
# dependencies of the cross libpthread.so, namely libihash.so. # 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 # This is actually only useful while building the final cross-gcc, since
# afterwards gcc-cross-wrapper should add the relevant flags. # afterwards gcc-cross-wrapper should add the relevant flags.
TARGET_LDFLAGS = "-Wl,-rpath-link=${hurd}/lib"; TARGET_LDFLAGS = "-rpath-link=${hurd}/lib";
}; };
} }
else { })) else { }))