4b27d28701
This comes from: svn diff ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff patch -p0 < diff and then adding into svn all files new from the patch. trunk@18255 comes from the last time I updated stdenv-updates from trunk. svn path=/nixpkgs/stdenv-updates2/; revision=18272
33 lines
679 B
Bash
33 lines
679 B
Bash
addCVars () {
|
|
if test -d $1/include; then
|
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
|
|
fi
|
|
|
|
if test -d $1/lib64; then
|
|
export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64"
|
|
fi
|
|
|
|
if test -d $1/lib; then
|
|
export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib"
|
|
fi
|
|
}
|
|
|
|
envHooks=(${envHooks[@]} addCVars)
|
|
|
|
# Note: these come *after* $out in the PATH (see setup.sh).
|
|
|
|
if test -n "@gcc@"; then
|
|
addToSearchPath PATH @gcc@/bin
|
|
fi
|
|
|
|
if test -n "@binutils@"; then
|
|
addToSearchPath PATH @binutils@/bin
|
|
fi
|
|
|
|
if test -n "@libc@"; then
|
|
addToSearchPath PATH @libc@/bin
|
|
fi
|
|
|
|
if test -n "@coreutils@"; then
|
|
addToSearchPath PATH @coreutils@/bin
|
|
fi
|