X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=files%2Fbootstrap-bsd.mk;h=f67e5b9c6551e414e7155a5256a7594f50736e0c;hb=0f77a20d07ac42684cc03ecdea0028bea2941488;hp=594217884315cbc582ca14edf41c48a348f603ee;hpb=d72a819a5d6275b13173527b53f60de77ea10e4e;p=pkgsrc-ghc.git

diff --git a/files/bootstrap-bsd.mk b/files/bootstrap-bsd.mk
index 5942178..f67e5b9 100644
--- a/files/bootstrap-bsd.mk
+++ b/files/bootstrap-bsd.mk
@@ -21,12 +21,9 @@ 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.
+# over 64 MiB) without -Os, 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 :(
-ghc_stage2_v_ALL_CC_OPTS += -fdata-sections -ffunction-sections
-ghc_stage2_v_EXTRA_CC_OPTS += -Wl,--gc-sections
+# MiB), but when it does we have to append CONF_CC_OPTS_STAGE0="-Os"
+# to CONFIGURE_ARGS as well. I guess that's a matter of time :(
+EXTRA_CC_OPTS += -Os