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/compilers/ghc/head.nix | |
parent | 8e4d051c622366e37ca19276aaf88d47648e4dce (diff) | |
download | nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.gz nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.bz2 nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.lz nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.xz nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.zst nixlib-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/compilers/ghc/head.nix')
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index b0b6ed3bab09..2824ce669ee6 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -100,16 +100,16 @@ stdenv.mkDerivation rec { done # GHC is a bit confused on its cross terminology, as these would normally be # the *host* tools. - export CC="$CC_FOR_TARGET" - export CXX="$CXX_FOR_TARGET" + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" - export AS="$AS_FOR_TARGET" - export AR="$AR_FOR_TARGET" - export NM="$NM_FOR_TARGET" - export RANLIB="$RANLIB_FOR_TARGET" - export READELF="$READELF_FOR_TARGET" - export STRIP="$STRIP_FOR_TARGET" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION |