Use the stage-specific CONF_CC_OPTS variables
authorIan Lynagh <igloo@earth.li>
Fri, 23 Jul 2010 13:23:23 +0000 (13:23 +0000)
committerIan Lynagh <igloo@earth.li>
Fri, 23 Jul 2010 13:23:23 +0000 (13:23 +0000)
ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 436cbc2..5c6b2f7 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -24,10 +24,10 @@ utils/hsc2hs_dist-install_HC_OPTS += -DNEW_GHC_LAYOUT
 utils/hsc2hs_template=$(INPLACE_TOPDIR)/template-hsc.h
 
 define utils/hsc2hs_dist_SHELL_WRAPPER_EXTRA
-echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS)) $(addprefix --lflag=,$(CONF_LD_OPTS)) -I$(TOP)/includes"' >> "$(WRAPPER)"
+echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS_STAGE0)) $(addprefix --lflag=,$(CONF_LD_OPTS_STAGE0)) -I$(TOP)/includes"' >> "$(WRAPPER)"
 endef
 define utils/hsc2hs_dist-install_SHELL_WRAPPER_EXTRA
-echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS)) $(addprefix --lflag=,$(CONF_LD_OPTS))"' >> "$(WRAPPER)"
+echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS_STAGE1)) $(addprefix --lflag=,$(CONF_LD_OPTS_STAGE1))"' >> "$(WRAPPER)"
 endef
 
 ifneq "$(BINDIST)" "YES"