X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=files%2Fbootstrap-bsd.mk;h=fdf7056fe6e603294cd871c6cf58cd9f7c7f973d;hb=9ac7c6d019018c0211c136c8cd27063699ff92af;hp=e621c0a2268cce9a90dbf1d8c9b39be0a940d744;hpb=ea579d5f0ee083910927b01c244780225fbba29f;p=pkgsrc-ghc.git

diff --git a/files/bootstrap-bsd.mk b/files/bootstrap-bsd.mk
index e621c0a..fdf7056 100644
--- a/files/bootstrap-bsd.mk
+++ b/files/bootstrap-bsd.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,19 @@ SplitObjs = NO
 GhcWithNativeCodeGen = NO
 GhcWithInterpreter = NO
 GhcWithSMP = NO
-ghc_stage2_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -lutil -lrt
-utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -lutil -lrt -ltermcap
+ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lutil -lrt
+utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lutil -lrt -lncurses
 
 SRC_CC_OPTS += -I[[PREFIX]]/include
 INTEGER_LIBRARY = integer-simple
+
+#   Unregisterised stage0 compiler gets too large (.text section being
+# over 64 MiB) without dead-code elimination, exceeding NetBSD/i386's
+# kernel default limitation.
+#   Note that stage1 currently doesn't bloat that much (about 42.6
+# MiB), but when it does we have to append
+# CONF_CC_OPTS_STAGE1="-fdata..." and
+# CONF_GCC_LINKER_OPTS_STAGE1="-Wl,--gc-sections" to CONFIGURE_ENV as
+# well. I guess that's a matter of time :(
+EXTRA_CC_OPTS += -fdata-sections -ffunction-sections
+EXTRA_CC_OPTS += -Wl,--gc-sections