alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

GCC 4.4: Use GCC documented variables instead of $NIX_EXTRA_CFLAGS and $NIX_EXTRA_LDFLAGS.

Browse source 
svn path=/nixpkgs/trunk/; revision=16418
This commit is contained in:
Ludovic Courtès 2009-07-18 12:37:48 +00:00
parent 8cbb8848a9
commit 161c18b075
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/gcc-4.4/builder.sh
View file

@ -35,18 +35,18 @@ if test "$noSysDirs" = "1"; then
export NIX_FIXINC_DUMMY=/usr/include export NIX_FIXINC_DUMMY=/usr/include
fi fi
# Setting $C_INCLUDE_PATH helps `xgcc' find the C library headers. # Setting $CPATH makes sure both `gcc' and `xgcc' find the C
export C_INCLUDE_PATH="$NIX_FIXINC_DUMMY" # library headers, regarless of the language being compiled.
export CPATH="$NIX_FIXINC_DUMMY:$gmp/include:$mpfr/include"
# Likewise, to help it find `crti.o' and similar files. # Likewise, to help it find `crti.o' and similar files.
export LIBRARY_PATH="$glibc_libdir" export LIBRARY_PATH="$glibc_libdir"
extraCFlags="-g0 -I$gmp/include -I$mpfr/include $extraCFlags" extraCFlags="-g0 $extraCFlags"
extraLDFlags="--strip-debug $extraLDFlags" extraLDFlags="--strip-debug $extraLDFlags"
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 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i"
done done
makeFlagsArray=( \ makeFlagsArray=( \
@ -54,9 +54,9 @@ if test "$noSysDirs" = "1"; then
NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
LIMITS_H_TEST=true \ LIMITS_H_TEST=true \
X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ X_CFLAGS="$extraCflags $EXTRA_LDFLAGS" \
LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ LDFLAGS="$extraCflags $EXTRA_LDFLAGS" \
LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ LDFLAGS_FOR_TARGET="$extraCflags $EXTRA_LDFLAGS" \
) )
fi fi