public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghc-*: Tool env vars no longer need to be made full paths

Browse Source
This commit is contained in:
John Ericson
2018-08-08 17:16:16 -04:00
parent 5a2ef9b513
commit 30ea1bfd22
5 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/8.0.2.nix
+10 -9
View File
@@ -102,15 +102,16 @@ stdenv.mkDerivation rec {
done done
# GHC is a bit confused on its cross terminology, as these would normally be # GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools. # the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CC="$CC_FOR_TARGET"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" export CXX="$CXX_FOR_TARGET"
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export AS="$AS_FOR_TARGET"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export AR="$AR_FOR_TARGET"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export NM="$NM_FOR_TARGET"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export RANLIB="$RANLIB_FOR_TARGET"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export READELF="$READELF_FOR_TARGET"
export STRIP="$STRIP_FOR_TARGET"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
pkgs/development/compilers/ghc/8.2.2.nix
+8 -8
View File
@@ -134,16 +134,16 @@ stdenv.mkDerivation rec {
done done
# GHC is a bit confused on its cross terminology, as these would normally be # GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools. # the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CC="$CC_FOR_TARGET"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" export CXX="$CXX_FOR_TARGET"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # 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 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 AS="$AS_FOR_TARGET"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export AR="$AR_FOR_TARGET"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="$NM_FOR_TARGET"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="$RANLIB_FOR_TARGET"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="$READELF_FOR_TARGET"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="$STRIP_FOR_TARGET"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
pkgs/development/compilers/ghc/8.4.3.nix
+8 -8
View File
@@ -106,16 +106,16 @@ stdenv.mkDerivation (rec {
done done
# GHC is a bit confused on its cross terminology, as these would normally be # GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools. # the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CC="$CC_FOR_TARGET"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" export CXX="$CXX_FOR_TARGET"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # 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 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 AS="$AS_FOR_TARGET"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export AR="$AR_FOR_TARGET"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="$NM_FOR_TARGET"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="$RANLIB_FOR_TARGET"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="$READELF_FOR_TARGET"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="$STRIP_FOR_TARGET"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
pkgs/development/compilers/ghc/8.6.1.nix
+8 -8
View File
@@ -98,16 +98,16 @@ stdenv.mkDerivation (rec {
done done
# GHC is a bit confused on its cross terminology, as these would normally be # GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools. # the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CC="$CC_FOR_TARGET"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" export CXX="$CXX_FOR_TARGET"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # 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 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 AS="$AS_FOR_TARGET"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export AR="$AR_FOR_TARGET"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="$NM_FOR_TARGET"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="$RANLIB_FOR_TARGET"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="$READELF_FOR_TARGET"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="$STRIP_FOR_TARGET"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
pkgs/development/compilers/ghc/head.nix
+8 -8
View File
@@ -100,16 +100,16 @@ stdenv.mkDerivation rec {
done done
# GHC is a bit confused on its cross terminology, as these would normally be # GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools. # the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" export CC="$CC_FOR_TARGET"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" export CXX="$CXX_FOR_TARGET"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 # 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 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 AS="$AS_FOR_TARGET"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" export AR="$AR_FOR_TARGET"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export NM="$NM_FOR_TARGET"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export RANLIB="$RANLIB_FOR_TARGET"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="$READELF_FOR_TARGET"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="$STRIP_FOR_TARGET"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK}" > mk/build.mk
echo ${version} >VERSION echo ${version} >VERSION