cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libgcc: Tool env vars no longer need to be made full paths

Browse source
This commit is contained in:
John Ericson 2018-08-06 22:41:56 -04:00
parent 044a73bbe6
commit 5a2ef9b513
1 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/development/libraries/gcc/libgcc/default.nix
View file

@ -46,22 +46,16 @@ stdenvNoLibs.mkDerivation rec {
mkdir -p "$buildRoot/gcc" mkdir -p "$buildRoot/gcc"
cd "$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 AS=$AS_FOR_BUILD
export CC=$CC_FOR_BUILD export CC=$CC_FOR_BUILD
export CPP=$CPP_FOR_BUILD export CPP=$CPP_FOR_BUILD
export CXX=$CXX_FOR_BUILD export CXX=$CXX_FOR_BUILD
export LD=$LD_FOR_BUILD export LD=$LD_FOR_BUILD
export AS_FOR_TARGET=${stdenvNoLibs.cc}/bin/$AS export AS_FOR_TARGET=$AS
export CC_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CC export CC_FOR_TARGET=$CC
export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP export CPP_FOR_TARGET=$CPP
export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD export LD_FOR_TARGET=$LD
export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1' export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1'
@ -87,23 +81,6 @@ stdenvNoLibs.mkDerivation rec {
cd "$buildRoot/gcc/${hostPlatform.config}/libgcc" cd "$buildRoot/gcc/${hostPlatform.config}/libgcc"
configureScript=$sourceRoot/configure configureScript=$sourceRoot/configure
chmod +x "$configureScript" 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 = [ gccConfigureFlags = [