Author: ludo
Date: Tue Jul 13 23:42:25 2010
New Revision: 22593
URL: https://svn.nixos.org/websvn/nix/?rev=22593&sc=1
Log:
GCC 4.5: Patch the right header file for pthread on GNU.
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 Tue Jul
13 22:35:50 2010 (r22592)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Tue Jul
13 23:42:25 2010 (r22593)
@@ -154,7 +154,8 @@
# in glibc, so add the right `-I' flags to the default spec string.
let
libc = if cross != null then libcCross else stdenv.glibc;
- config_h = "gcc/config/i386/gnu.h";
+ gnu_h = "gcc/config/gnu.h";
+ i386_gnu_h = "gcc/config/i386/gnu.h";
extraCPPDeps =
libc.propagatedBuildInputs
++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
@@ -165,12 +166,12 @@
pthreadLib =
if libpthreadCross != null then libpthreadCross else libpthread;
in
- '' echo "augmenting \`CPP_SPEC' in \`${config_h}' with
\`${extraCPPSpec}'..."
- sed -i "${config_h}" \
+ '' 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 \`${config_h}' for libpthread at
\`${pthreadLib}'..."
- sed -i "${config_h}" \
+ echo "augmenting \`LIB_SPEC' in \`${gnu_h}' for libpthread at
\`${pthreadLib}'..."
+ sed -i "${gnu_h}" \
-es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "-L${pthreadLib}/lib \1|g'
''
else null;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
