Author: viric
Date: Mon Dec 20 17:35:34 2010
New Revision: 25215
URL: https://svn.nixos.org/websvn/nix/?rev=25215&sc=1
Log:
Fixing the gcc postPatch, for the static stage of the cross-compiler
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Mon Dec 20 17:34:49 2010 (r25214)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Mon Dec 20 17:35:34 2010 (r25215)
@@ -180,7 +180,7 @@
# On NixOS, use the right path to the dynamic linker instead of
# `/lib/ld*.so'.
let
- libc = if cross != null then libcCross else stdenv.gcc.libc;
+ libc = if (cross != null && libcCross != null) then libcCross else
stdenv.gcc.libc;
in
'' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and
\`UCLIBC_DYNAMIC_LINKER' macros..."
for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
