diff options
| author | Shea Levy <shea@shealevy.com> | 2015-01-28 13:47:47 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-01-28 13:47:47 -0500 |
| commit | cfb29ab882323d379aba20a95020c7c24f883eae (patch) | |
| tree | 658d43b42121033532cca326754f777b688c0a8e /pkgs/build-support | |
| parent | 0caae022fd5baa1c96bec716d18a3906b6776911 (diff) | |
| parent | 9bccb95a82de93d0419495acaf0ae0af581d4642 (diff) | |
| download | nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.tar nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.tar.gz nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.tar.bz2 nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.tar.lz nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.tar.xz nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.tar.zst nixlib-cfb29ab882323d379aba20a95020c7c24f883eae.zip | |
Merge branch 'gridaphobe' into staging
fix cc-wrapper for cross-compilation
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 9 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index cd98f57ee937..e23d7f4cf12b 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -34,5 +34,10 @@ if [ -n "@coreutils@" ]; then addToSearchPath PATH @coreutils@/bin fi -export CC=@real_cc@ -export CXX=@real_cxx@ +if [ -z "$crossConfig" ]; then + export CC=@real_cc@ + export CXX=@real_cxx@ +else + export BUILD_CC=@real_cc@ + export BUILD_CXX=@real_cxx@ +fi diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh index ce5f6e56136e..599954bd127d 100644 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh @@ -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" fi fi + +export CC=${crossConfig}-gcc +export CXX=${crossConfig}-g++ |