Author: ludo
Date: Wed Jul 14 23:21:36 2010
New Revision: 22603
URL: https://svn.nixos.org/websvn/nix/?rev=22603&sc=1
Log:
GCC 4.5: Augment `LIB_SPEC' so that GNU's libpthread's deps are visible.
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Wed Jul
14 15:02:34 2010 (r22602)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Wed Jul
14 23:21:36 2010 (r22603)
@@ -163,16 +163,18 @@
extraCPPSpec =
concatStrings (intersperse " "
(map (x: "-I${x}/include") extraCPPDeps));
- pthreadLib =
- if libpthreadCross != null then libpthreadCross else libpthread;
+ extraLibSpec =
+ if libpthreadCross != null
+ then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+ else "-L${libpthread}/lib";
in
'' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with
\`${extraCPPSpec}'..."
sed -i "${i386_gnu_h}" \
-es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
- echo "augmenting \`LIB_SPEC' in \`${gnu_h}' for libpthread at
\`${pthreadLib}'..."
+ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with
\`${extraLibSpec}'..."
sed -i "${gnu_h}" \
- -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "-L${pthreadLib}/lib \1|g'
+ -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
''
else null;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
