bf414c9d4f
- there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.
33 lines
690 B
Bash
33 lines
690 B
Bash
addCVars () {
|
|
if test -d $1/include; then
|
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $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@/bin
|
|
fi
|
|
|
|
if test -n "@coreutils@"; then
|
|
addToSearchPath PATH @coreutils@/bin
|
|
fi
|