X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=files%2Fbootstrap.mk;h=e20f79a148f3638dd2a767e904dce6e02b0b8d9d;hb=af9d73d52d0864b3f8b1ff223e543f9b09e291f7;hp=066ccd0764e034489ca38c17f86c395a3627dab0;hpb=ea579d5f0ee083910927b01c244780225fbba29f;p=pkgsrc-ghc.git

diff --git a/files/bootstrap.mk b/files/bootstrap.mk
index 066ccd0..e20f79a 100644
--- a/files/bootstrap.mk
+++ b/files/bootstrap.mk
@@ -1,4 +1,7 @@
+OMIT_PHASE_0 = YES
+OMIT_PHASE_1 = YES
 GHC = false
+GHC_STAGE1 =
 GHC_PKG_INPLACE =
 GHC_CABAL_INPLACE =
 DUMMY_GHC_INPLACE =
@@ -11,8 +14,14 @@ SplitObjs = NO
 GhcWithNativeCodeGen = NO
 GhcWithInterpreter = NO
 GhcWithSMP = NO
-ghc_stage2_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv
-utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -ltermcap
+ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv
+utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lncurses
 
 SRC_CC_OPTS += -I[[PREFIX]]/include
 INTEGER_LIBRARY = integer-simple
+
+# Unregisterised stage0 compiler runs way too slow without GCC's
+# optimisation. The stage1 (which is also unregisterised) is still
+# slow, but then we have to append CONF_CC_OPTS_STAGE1="-O2" to
+# CONFIGURE_ENV as well.
+EXTRA_CC_OPTS += -O2