f3c23487a2
stdenv. In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared objects through direct pass as ld command arguments of the absolute path to shared objects, instead of using the -L/-l combinations. cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly passing the absolute path to the shared object to the linker, and as our wrapper did not add any -rpath for those, writting the nix expressions for some cmake packages resulted in a lot of tricks, compared to using this gcc-wrapper2. This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a stdenv update. I also updated some cmake expressions to use this gcc-wrapper2, and reduced its tricks. I also updated the cmake setup-hook for it to make cmake not touch any rpath decided at build time, when running the 'make install' of makefiles created by cmake. svn path=/nixpkgs/trunk/; revision=18885
30 lines
603 B
Bash
30 lines
603 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
|