diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:15:02 -0500 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-08-22 01:14:53 +0200 |
commit | 13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b (patch) | |
tree | 97a5964b24ae870c5e4b924014bf28eb858e07ce /pkgs/development/libraries/gcc | |
parent | 8e4d051c622366e37ca19276aaf88d47648e4dce (diff) | |
download | nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.gz nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.bz2 nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.lz nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.xz nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.zst nixpkgs-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.zip |
Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path"
This reverts commit 89efc27f571368b475ce87e71445be10a9d1121a, reversing changes made to d0f11020ca55dfe20ecad05005343e3a3e3cbd90.
Diffstat (limited to 'pkgs/development/libraries/gcc')
-rw-r--r-- | pkgs/development/libraries/gcc/libgcc/default.nix | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index ef605d8702f..0a29ab6927f 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -46,16 +46,22 @@ stdenvNoLibs.mkDerivation rec { mkdir -p "$buildRoot/gcc" cd "$buildRoot/gcc" ( + export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD + export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD + export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD + export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD + export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD + export AS=$AS_FOR_BUILD export CC=$CC_FOR_BUILD export CPP=$CPP_FOR_BUILD export CXX=$CXX_FOR_BUILD export LD=$LD_FOR_BUILD - export AS_FOR_TARGET=$AS - export CC_FOR_TARGET=$CC - export CPP_FOR_TARGET=$CPP - export LD_FOR_TARGET=$LD + export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS + export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC + export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP + export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1' @@ -81,6 +87,23 @@ stdenvNoLibs.mkDerivation rec { cd "$buildRoot/gcc/${hostPlatform.config}/libgcc" configureScript=$sourceRoot/configure chmod +x "$configureScript" + + export AS_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$AS_FOR_BUILD + export CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CC_FOR_BUILD + export CPP_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CPP_FOR_BUILD + export CXX_FOR_BUILD=${buildPackages.stdenv.cc}/bin/$CXX_FOR_BUILD + export LD_FOR_BUILD=${buildPackages.stdenv.cc.bintools}/bin/$LD_FOR_BUILD + + export AS=${stdenvNoLibs.cc}/bin/$AS + export CC=${stdenvNoLibs.cc}/bin/$CC + export CPP=${stdenvNoLibs.cc}/bin/$CPP + export CXX=${stdenvNoLibs.cc}/bin/$CXX + export LD=${stdenvNoLibs.cc.bintools}/bin/$LD + + export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS_FOR_TARGET + export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC_FOR_TARGET + export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP_FOR_TARGET + export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET ''; gccConfigureFlags = [ |