bootstrap.mk: tidy-up

diff --git a/bootstrap.mk b/bootstrap.mk
index 2047238cfcbf9c06a89c394bb3366486f3b95242..317ef13f527e79b40350231f5b8e6338050c0ae1 100644 (file)
--- a/bootstrap.mk
+++ b/bootstrap.mk
@@ -11,36 +11,52 @@ USE_TOOLS+= autoconf date gtar perl
 # "${BUILDLINK_DIR}/bin". Note that in-place ghc isn't usable until we
 # run "ghc-pkg recache".
 
+BOOTSTRAP_MAIN_C=      ${PKGDIR}/files/bootstrap-main.c
+BOOTSTRAP_CC_OPTS=     -I${PREFIX:Q}/include
+BOOTSTRAP_LD_OPTS=     -L${PREFIX:Q}/lib -Wl,-rpath -Wl,${PREFIX:Q}/lib
+BOOTSTRAP_LD_OPTS+=    -lm -liconv -lncurses
+BOOTSTRAP_CONF_ARGS=   --enable-hc-boot --with-ghc=""
+
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
+PLATFORM=              i386-unknown-netbsd
 BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-netbsd-i386.c
 BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
-PLATFORM               = i386-unknown-netbsd
+# Unregisterised compilers get too large (.text section being over 64
+# MiB) without -Os, exceeding NetBSD/i386's kernel default limitation.
+BOOTSTRAP_CC_OPTS+=    -Os
+BOOTSTRAP_CONF_ARGS+=  CONF_CC_OPTS_STAGE2="-Os"
 
 .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
+PLATFORM=              i386-unknown-freebsd
 BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-freebsd-i386.c
 BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
-PLATFORM=              i386-unknown-freebsd
+BOOTSTRAP_CC_OPTS+=    -O2
+BOOTSTRAP_LD_OPTS+=    -lutil -lrt
+BOOTSTRAP_CONF_ARGS+=  CONF_CC_OPTS_STAGE2="-O2"
 
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
+PLATFORM=              powerpc-apple-darwin
 BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-darwin-powerpc.c
 BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-powerpc-apple-darwin9.8.0.tar.bz2
-PLATFORM=              powerpc-apple-darwin
+BOOTSTRAP_CC_OPTS+=    -O2
+BOOTSTRAP_CONF_ARGS+=  CONF_CC_OPTS_STAGE2="-O2"
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ghc-6.12.1/aclocal.m4
 # (FP_LEADING_UNDERSCORE)
-CONFLICTS=             libelf-[0-9]*
+CONFLICTS+=            libelf-[0-9]*
 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"
+PLATFORM=              x86_64-unknown-linux
 BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-linux-x86_64.c
 BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-x86_64-unknown-linux-gnu.tar.bz2
-PLATFORM=              x86_64-unknown-linux
+BOOTSTRAP_CC_OPTS+=    -O2
+BOOTSTRAP_LD_OPTS+=    -lrt -ldl
+BOOTSTRAP_CONF_ARGS+=  CONF_CC_OPTS_STAGE2="-O2"
 
 .else
 PKG_FAIL_REASON+=      "internal error: unsupported platform"
 .endif
 
-BOOTSTRAP_MAIN_C=      ${PKGDIR}/files/bootstrap-main.c
-
 pre-configure: ${WRKDIR}/stamp-bootstrap-ghc
 
 ${WRKDIR}/stamp-autoreconf:
@@ -55,14 +71,14 @@ ${WRKDIR}/stamp-prepare-bootstrap: ${WRKDIR}/stamp-autoreconf
                ${RM} -rf bootstrap && \
                ${MKDIR} bootstrap && \
                ${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xf - && \
-               ${CP} -f ${BOOTSTRAP_MAIN_C} bootstrap/${DISTNAME}/rts/bootstrap-main.c && \
-               ${CP} -f ${BOOTSTRAP_CAPI_C} bootstrap/${DISTNAME}/rts/capi-wrappers.c  && \
+               ${CP} -f ${BOOTSTRAP_MAIN_C:Q} bootstrap/${DISTNAME}/rts/bootstrap-main.c && \
+               ${CP} -f ${BOOTSTRAP_CAPI_C:Q} bootstrap/${DISTNAME}/rts/capi-wrappers.c  && \
                ${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
        ${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
                ${PHASE_MSG} "Configuring bootstrapping compiler for ${PKGNAME}" && \
-               ${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot --with-ghc="" ${CONFIGURE_ARGS} && \
+               ${SETENV} ${CONFIGURE_ENV} ./configure ${BOOTSTRAP_CONF_ARGS} ${CONFIGURE_ARGS} && \
                ${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot
@@ -76,35 +92,12 @@ ${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot
                (cd ${DISTNAME} && ${SH} mkfiles) && \
                ${TOUCH} ${.TARGET}
 
-${WRKDIR}/bootstrap/${DISTNAME}/mk/build.mk: ${WRKDIR}/stamp-extract-hc
-       ${RUN} ${PHASE_MSG} "Creating bootstrapping configuration file for ${PKGNAME}"
-       ${RUN} ${CP} -f ${PKGDIR}/files/build.bootstrap.common.mk ${.TARGET}
-       ${RUN} ${ECHO} "SRC_CC_OPTS += -I${PREFIX}/include" >> ${.TARGET}
-.if ${OPSYS} == "Darwin"
-       ${RUN} ${ECHO} "ghc_stage2_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv" >> ${.TARGET}
-       ${RUN} ${ECHO} "utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lncurses" >> ${.TARGET}
-       ${RUN} ${ECHO} "EXTRA_CC_OPTS += -O2" >> ${.TARGET}
-.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD"
-       ${RUN} ${ECHO} "ghc_stage2_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lutil -lrt" >> ${.TARGET}
-       ${RUN} ${ECHO} "utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lutil -lrt -lncurses" >> ${.TARGET}
-#   Unregisterised stage0 compiler gets too large (.text section being
-# 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_STAGE0="-Os"
-# to CONFIGURE_ARGS as well. I guess that's a matter of time :(
-       ${RUN} ${ECHO} "EXTRA_CC_OPTS += -Os" >> ${.TARGET}
-.elif ${OPSYS} == "Linux"
-       ${RUN} ${ECHO} "ghc_stage2_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lrt -ldl" >> ${.TARGET}
-       ${RUN} ${ECHO} "utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lrt -ldl -lncurses" >> ${.TARGET}
-       ${RUN} ${ECHO} "EXTRA_CC_OPTS += -O2" >> ${.TARGET}
-.else
-PKG_FAIL_REASON+=      "internal error: unsupported platform"
-.endif
-
-${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc ${WRKDIR}/bootstrap/${DISTNAME}/mk/build.mk
+${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
        ${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
                ${PHASE_MSG} "Rewriting source paths in bootstrapping compiler for ${PKGNAME}" && \
+               ${CP} -f ${PKGDIR:Q}/files/build.bootstrap.common.mk mk/build.mk && \
+               ${ECHO} "SRC_CC_OPTS += ${BOOTSTRAP_CC_OPTS}" >> mk/build.mk && \
+               ${ECHO} "LD_OPTS += ${BOOTSTRAP_LD_OPTS}" >> mk/build.mk && \
                for c in libraries/*/configure; do \
                        (cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \
                done && \