public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gridaphobe' into staging 

fix cc-wrapper for cross-compilation
This commit is contained in:
Shea Levy 2015-01-28 13:47:47 -05:00
parent 0caae022fd 9bccb95a82
commit cfb29ab882
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/cc-wrapper/setup-hook.sh
View File

@ -34,5 +34,10 @@ if [ -n "@coreutils@" ]; then
addToSearchPath PATH @coreutils@/bin addToSearchPath PATH @coreutils@/bin
fi fi
export CC=@real_cc@ if [ -z "$crossConfig" ]; then
export CXX=@real_cxx@ export CC=@real_cc@
export CXX=@real_cxx@
else
export BUILD_CC=@real_cc@
export BUILD_CXX=@real_cxx@
fi

3
pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
View File

@ -85,3 +85,6 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then
export NIX_CROSS_LDFLAGS="-rpath $out/lib64 -rpath-link $out/lib $NIX_CROSS_LDFLAGS" export NIX_CROSS_LDFLAGS="-rpath $out/lib64 -rpath-link $out/lib $NIX_CROSS_LDFLAGS"
fi fi
fi fi
export CC=${crossConfig}-gcc
export CXX=${crossConfig}-g++