From 793bde8add5bf57f06ed8e48cd99e84861d01a1a Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sat, 24 Jul 2010 11:37:48 +0000
Subject: Set stage-specific CC/LD opts in the bindist configure.ac

---
 distrib/configure.ac.in | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'distrib')

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)
-- 
cgit v1.2.1