beaff0a892
libgcc of the gcc being built, not the gcc building it. * Only include a directory in the rpath of an executable/library if it is actually used. Before, the `/lib' directory of every build input was added to the rpath, causing many unnecessary retained dependencies. For instance, Perl has a `/lib' directory, but most applications whose build process uses Perl don't actually link against Perl. (Also added a test for this.) * After building glibc, remove glibcbug, to prevent a retained dependency on gcc. * Add a newline after `building X' in GNU Make. svn path=/nixpkgs/trunk/; revision=911
26 lines
484 B
Bash
26 lines
484 B
Bash
addCVars () {
|
|
if test -d $1/include; then
|
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$1/include"
|
|
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
|
|
PATH=$PATH:@gcc@/bin
|
|
fi
|
|
|
|
if test -n "@binutils@"; then
|
|
PATH=$PATH:@binutils@/bin
|
|
fi
|
|
|
|
if test -n "@glibc@"; then
|
|
PATH=$PATH:@glibc@/bin
|
|
fi
|