summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-07-24 11:37:48 +0000
committerIan Lynagh <igloo@earth.li>2010-07-24 11:37:48 +0000
commit793bde8add5bf57f06ed8e48cd99e84861d01a1a (patch)
tree0e6662b50afc019c9411dd915052a32793509910 /distrib
parent30fad70245d9ddfae0b781460bc51468a01f92f6 (diff)
downloadhaskell-793bde8add5bf57f06ed8e48cd99e84861d01a1a.tar.gz
Set stage-specific CC/LD opts in the bindist configure.ac
Diffstat (limited to 'distrib')
-rw-r--r--distrib/configure.ac.in15
1 files changed, 11 insertions, 4 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 27109a2e1c..cc834679d3 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -77,10 +77,17 @@ dnl ** Check gcc version and flags we need to pass it **
#
FP_GCC_EXTRA_FLAGS
-CONF_CC_OPTS="@CONF_CC_OPTS@"
-CONF_LD_OPTS="@CONF_LD_OPTS@"
-AC_SUBST(CONF_CC_OPTS)
-AC_SUBST(CONF_LD_OPTS)
+FPTOOLS_SET_C_LD_FLAGS([target],[CFLAGS],[LDFLAGS])
+FPTOOLS_SET_C_LD_FLAGS([build],[CONF_CC_OPTS_STAGE0],[CONF_LD_OPTS_STAGE0])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_LD_OPTS_STAGE1])
+FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_LD_OPTS_STAGE2])
+
+AC_SUBST(CONF_CC_OPTS_STAGE0)
+AC_SUBST(CONF_CC_OPTS_STAGE1)
+AC_SUBST(CONF_CC_OPTS_STAGE2)
+AC_SUBST(CONF_LD_OPTS_STAGE0)
+AC_SUBST(CONF_LD_OPTS_STAGE1)
+AC_SUBST(CONF_LD_OPTS_STAGE2)
#
AC_CONFIG_FILES(extra-gcc-opts mk/config.mk mk/install.mk)