diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
commit | 551fec44673ea023c303335e762f880d3c28646e (patch) | |
tree | 4d726dc291badc45899c225e36f5315ef7f938ee /pkgs/development/compilers/ghc/8.4.3.nix | |
parent | 3f889f30bee92c3f2d5eaf53e56aef68f61efc4a (diff) | |
parent | 291de70ed6b736285ae4de6e3e556c0fc86c2348 (diff) | |
download | nixlib-551fec44673ea023c303335e762f880d3c28646e.tar nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.gz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.bz2 nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.lz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.xz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.zst nixlib-551fec44673ea023c303335e762f880d3c28646e.zip |
Merge branch 'master' into es6
Diffstat (limited to 'pkgs/development/compilers/ghc/8.4.3.nix')
-rw-r--r-- | pkgs/development/compilers/ghc/8.4.3.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 7be209aa5fac..522dd9cfbf06 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -30,6 +30,10 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross" +, # Whether to backport https://phabricator.haskell.org/D4388 for + # deterministic profiling symbol names, at the cost of a slightly + # non-standard GHC API + deterministicProfiling ? false }: assert !enableIntegerSimple -> gmp != null; @@ -94,7 +98,12 @@ stdenv.mkDerivation (rec { sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; extraPrefix = "utils/hsc2hs/"; stripLen = 1; - })] + })] ++ stdenv.lib.optional deterministicProfiling + (fetchpatch rec { + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D4388.diff"; + sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s"; + }) ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch; postPatch = "patchShebangs ."; @@ -106,16 +115,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 |