X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fdistdir-way-opts.mk;h=06fbb0b811b3be500ae5583a6f649126a306c852;hb=7720e1503ee9b6ea2b949f95287a32b8d3361bb0;hp=ac7c0d8dcdf95bfff18f6296ff2c301b87dd0d96;hpb=01d63b084d9115746772876e54edacd82028d35c;p=ghc-hetmet.git

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index ac7c0d8..06fbb0b 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -77,12 +77,12 @@ endif
 
 # We have to do this mangling using the shell, because words may contain
 # spaces and GNU make doesn't have any quoting interpretation.
-ifneq ($(strip $($1_$2_DEP_INCLUDE_DIRS)),)
+ifneq ($$(strip $$($1_$2_DEP_INCLUDE_DIRS)),)
 $1_$2_CC_INC_FLAGS:=$$(shell for i in $$($1_$2_DEP_INCLUDE_DIRS); do echo $$($1_$2_DEP_INCLUDE_DIRS_FLAG)\"$$$$i\"; done)
 endif
 
 $1_$2_DIST_CC_OPTS = \
- $$(CONF_CC_OPTS) \
+ $$(CONF_CC_OPTS_STAGE$4) \
  $$(SRC_CC_OPTS) \
  $$($1_CC_OPTS) \
  $$(foreach dir,$$(filter-out /%,$$($1_$2_INCLUDE_DIRS)),-I$1/$$(dir)) \
@@ -92,12 +92,12 @@ $1_$2_DIST_CC_OPTS = \
  $$($1_$2_CC_INC_FLAGS) \
  $$($1_$2_DEP_CC_OPTS)
 
-ifneq ($(strip $($1_$2_DEP_LIB_DIRS)),)
+ifneq ($$(strip $$($1_$2_DEP_LIB_DIRS)),)
 $1_$2_DIST_LD_LIB_DIRS:=$$(shell for i in $$($1_$2_DEP_LIB_DIRS); do echo \"-L$$$$i\"; done)
 endif
 
 $1_$2_DIST_LD_OPTS = \
- $$(CONF_LD_OPTS) \
+ $$(CONF_LD_OPTS_STAGE$4) \
  $$(SRC_LD_OPTS) \
  $$($1_LD_OPTS) \
  $$($1_$2_LD_OPTS) \
@@ -108,10 +108,10 @@ $1_$2_DIST_LD_OPTS = \
 # c.f. Cabal's Distribution.Simple.PreProcess.ppHsc2hs
 # We use '' around cflags and lflags to handle paths with backslashes in
 # on Windows
-ifneq ($(strip $($1_$2_DIST_CC_OPTS)),)
+ifneq ($$(strip $$($1_$2_DIST_CC_OPTS)),)
 $1_$2_$3_HSC2HS_CC_OPTS:=$$(shell for i in $$($1_$2_DIST_CC_OPTS); do echo \'--cflag=$$$$i\'; done)
 endif
-ifneq ($(strip $($1_$2_DIST_LD_OPTS)),)
+ifneq ($$(strip $$($1_$2_DIST_LD_OPTS)),)
 $1_$2_$3_HSC2HS_LD_OPTS:=$$(shell for i in $$($1_$2_DIST_LD_OPTS); do echo \'--lflag=$$$$i\'; done)
 endif