diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-08-17 16:12:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 16:12:26 -0400 |
commit | 89efc27f571368b475ce87e71445be10a9d1121a (patch) | |
tree | 4e15a2a140d55effe691a0f127175dd4f0ba986f /pkgs/development/compilers/ghc | |
parent | d0f11020ca55dfe20ecad05005343e3a3e3cbd90 (diff) | |
parent | 30ea1bfd221277735e1e19ab916e96709759bd51 (diff) | |
download | nixlib-89efc27f571368b475ce87e71445be10a9d1121a.tar nixlib-89efc27f571368b475ce87e71445be10a9d1121a.tar.gz nixlib-89efc27f571368b475ce87e71445be10a9d1121a.tar.bz2 nixlib-89efc27f571368b475ce87e71445be10a9d1121a.tar.lz nixlib-89efc27f571368b475ce87e71445be10a9d1121a.tar.xz nixlib-89efc27f571368b475ce87e71445be10a9d1121a.tar.zst nixlib-89efc27f571368b475ce87e71445be10a9d1121a.zip |
Merge pull request #44767 from obsidiansystems/wrapper-env-var-path
{cc,bintools}-wrapper, ghc, libgcc: Define wrapper env vars as full paths
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 19 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.4.3.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.6.1.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 16 |
5 files changed, 42 insertions, 41 deletions
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index ddd9c27589ac..fdbe4cf902ff 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -102,15 +102,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 LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld" - 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 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="$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 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 79c910e5fd21..6ff1a2483720 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -134,16 +134,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 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 3f1f539cab78..923b5b6647b2 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -114,16 +114,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 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index fdb60ce3f2e8..a94c9e3d3f1c 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -98,16 +98,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 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure 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 |