add $(CONF_*_OPTS) for options that come from ./configure (fixes #3426)

[ghc-hetmet.git] / rules / distdir-way-opts.mk

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index c3656b7..7a23b72 100644 (file)
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -17,16 +17,20 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way
 
 # Options for a Haskell compilation:
 #   - SRC_HC_OPTS                  source-tree-wide options
+#                                 (optimisation, heap settings)
+#   - CONF_HC_OPTS                 source-tree-wide options, selected at
+#                                 configure-time
+#   - libraries/base_HC_OPTS       options from libraries/base for all ways
+#   - libraries/base_v_HC_OPTS     options from libraries/base for way v
 #   - WAY_v_HC_OPTS                options for this way
-#   - libraries/base_BUILD_HC_OPTS options from the build system for this dir
+#   - EXTRA_HC_OPTS                options from the command-line
 #   - -Idir1 -Idir2 ...                   include-dirs from this package
 #   - -odir/-hidir/-stubdir        put the output files under $3/build
 #   - -osuf/-hisuf/-hcsuf          suffixes for the output files in this way
-#   - EXTRA_HC_OPTS                options from the command-line
 
 $1_$2_$3_MOST_HC_OPTS = \
  $$(WAY_$3_HC_OPTS) \
- $$($1_$2_BUILD_HC_OPTS) \
+ $$($1_$2_DIST_HC_OPTS) \
  $$($1_$2_$3_HC_OPTS) \
  $$($$*_HC_OPTS) \
  $$(EXTRA_HC_OPTS)
@@ -43,17 +47,18 @@ $1_$2_$3_ALL_HC_OPTS = \
 $1_$2_$3_ALL_HSC2HS_OPTS = \
  --cc=$$(WhatGccIsCalled) \
  --ld=$$(WhatGccIsCalled) \
+ $$(CONF_HSC2HS_OPTS) \
  $$(SRC_HSC2HS_OPTS) \
  $$(WAY_$3_HSC2HS_OPTS) \
  --cflag=-D__GLASGOW_HASKELL__=$$(ProjectVersionInt) \
- $$(foreach opt,$$($1_$2_BUILD_CC_OPTS),'--cflag=$$(opt)') \
- $$(foreach opt,$$($1_$2_BUILD_LD_OPTS),'--lflag=$$(opt)') \
+ $$(foreach opt,$$($1_$2_DIST_CC_OPTS),'--cflag=$$(opt)') \
+ $$(foreach opt,$$($1_$2_DIST_LD_OPTS),'--lflag=$$(opt)') \
  $$($$*_HSC2HS_OPTS) \
  $$(EXTRA_HSC2HS_OPTS)
 
 $1_$2_$3_ALL_CC_OPTS = \
  $$(WAY_$3_CC_OPTS) \
- $$($1_$2_BUILD_CC_OPTS) \
+ $$($1_$2_DIST_CC_OPTS) \
  $$($1_$2_$3_CC_OPTS) \
  $$($$*_CC_OPTS) \
  $$(EXTRA_CC_OPTS)
@@ -63,6 +68,7 @@ $1_$2_$3_GHC_CC_OPTS = \
  $$($1_$2_$3_MOST_HC_OPTS)
 
 $1_$2_$3_ALL_AS_OPTS = \
+ $$(CONF_AS_OPTS) \
  $$(SRC_AS_OPTS)
  $$(WAY_$3_AS_OPTS) \
  $$($1_AS_OPTS) \
@@ -71,6 +77,7 @@ $1_$2_$3_ALL_AS_OPTS = \
  $$(EXTRA_AS_OPTS)
 
 $1_$2_$3_ALL_ALEX_OPTS = \
+ $$(CONF_ALEX_OPTS) \
  $$(SRC_ALEX_OPTS)
  $$(WAY_$3_ALEX_OPTS) \
  $$($1_ALEX_OPTS) \
@@ -79,6 +86,7 @@ $1_$2_$3_ALL_ALEX_OPTS = \
  $$(EXTRA_ALEX_OPTS)
 
 $1_$2_$3_ALL_HAPPY_OPTS = \
+ $$(CONF_HAPPY_OPTS) \
  $$(SRC_HAPPY_OPTS) \
  $$(WAY_$3_HAPPY_OPTS) \
  $$($1_HAPPY_OPTS) \