X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fconfigure.ac.in;h=cc834679d36b6b823ff84bdca71072b81c7dcbb3;hb=5de363ca9ebdb7d85e3c353c1cffdf0a1c11128e;hp=27109a2e1ceabe5db1121ea5d5a0cb8a49f0040e;hpb=4a0b6d6cba4c6d053c928ecc111ff0a300443f4b;p=ghc-hetmet.git

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 27109a2..cc83467 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)