diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-06 22:41:56 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-08 17:16:16 -0400 |
commit | 30ea1bfd221277735e1e19ab916e96709759bd51 (patch) | |
tree | db59b9b9572a5ee5c58b8c71761ea405c0b8f7f9 /pkgs/development/compilers/ghc/head.nix | |
parent | 5a2ef9b51366128852ec8affcf6a207e572c0b2b (diff) | |
download | nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.tar nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.tar.gz nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.tar.bz2 nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.tar.lz nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.tar.xz nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.tar.zst nixlib-30ea1bfd221277735e1e19ab916e96709759bd51.zip |
ghc-*: Tool env vars no longer need to be made full paths
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 2824ce669ee6..b0b6ed3bab09 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="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + export CC="$CC_FOR_TARGET" + export CXX="$CXX_FOR_TARGET" # 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="${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" + 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" echo -n "${buildMK}" > mk/build.mk echo ${version} >VERSION |