* Fix building in an impure environment.
svn path=/nixpkgs/trunk/; revision=6841
This commit is contained in:
parent
1a7576f193
commit
7f9a2ecc16
@ -10,25 +10,33 @@ mkdir $NIX_FIXINC_DUMMY
|
|||||||
export CPP="gcc -E"
|
export CPP="gcc -E"
|
||||||
|
|
||||||
|
|
||||||
if test "$noSysDirs" = "1" -a -e $NIX_GCC/nix-support/orig-libc; then
|
if test "$noSysDirs" = "1"; then
|
||||||
|
|
||||||
# Figure out what extra flags to pass to the gcc compilers being
|
if test -e $NIX_GCC/nix-support/orig-libc; then
|
||||||
# generated to make sure that they use our glibc.
|
|
||||||
|
# Figure out what extra flags to pass to the gcc compilers
|
||||||
|
# being generated to make sure that they use our glibc.
|
||||||
extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
|
extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
|
||||||
extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"
|
extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"
|
||||||
|
|
||||||
# Use *real* header files, otherwise a limits.h is generated that
|
# Use *real* header files, otherwise a limits.h is generated
|
||||||
# does not include Glibc's limits.h (notably missing SSIZE_MAX,
|
# that does not include Glibc's limits.h (notably missing
|
||||||
# which breaks the build).
|
# SSIZE_MAX, which breaks the build).
|
||||||
export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
|
export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
|
||||||
|
|
||||||
|
else
|
||||||
|
# Hack: support impure environments.
|
||||||
|
extraCFlags="-isystem /usr/include"
|
||||||
|
extraLDFlags="-L/usr/lib64 -L/usr/lib"
|
||||||
|
export NIX_FIXINC_DUMMY=/usr/include
|
||||||
|
fi
|
||||||
|
|
||||||
export NIX_EXTRA_CFLAGS=$extraCFlags
|
export NIX_EXTRA_CFLAGS=$extraCFlags
|
||||||
for i in $extraLDFlags; do
|
for i in $extraLDFlags; do
|
||||||
export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
|
export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
|
||||||
done
|
done
|
||||||
export CFLAGS=$extraCFlags
|
export CFLAGS=$extraCFlags
|
||||||
export CXXFLAGS=$extraCFlags
|
export CXXFLAGS=$extraCFlags
|
||||||
# export LDFLAGS=$extraLDFlags
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user