Skip to content

Commit

Permalink
Revert "Add function to build a ghc standalone archive (OSX/iOS only)"
Browse files Browse the repository at this point in the history
Partial revert of accidental changes.

This reverts commit 4f9f00f.
  • Loading branch information
shlevy committed Jan 23, 2017
1 parent 4f9f00f commit 46bec22
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions pkgs/development/compilers/ghc/head.nix
Expand Up @@ -85,17 +85,8 @@ in stdenv.mkDerivation (rec {
} // stdenv.lib.optionalAttrs (cross != null) {
name = "${cross.config}-ghc-${version}";

patches = [ ./ios-linker.patch ];

preConfigure = commonPreConfigure + ''
sed 's|#BuildFlavour = quick-cross|BuildFlavour = quick-cross|' mk/build.mk.sample > mk/build.mk
echo "GhcRtsCcOpts = -glldb -Og" >> mk/build.mk
'';

postUnpack = ''
mkdir -p $out/nix-support
mv $sourceRoot $out/nix-support/source
sourceRoot=$out/nix-support/source
sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
'';

configureFlags = [
Expand All @@ -112,8 +103,6 @@ in stdenv.mkDerivation (rec {

dontSetConfigureCross = true;

dontStrip = true;

passthru = {
inherit bootPkgs cross;

Expand Down

0 comments on commit 46bec22

Please sign in to comment.