X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fdistdir-way-opts.mk;h=bd09ad152817c1abb8a47a2c1289bf9a79350b72;hb=497cdc321da61d90f01cca6b57d974742bea7aa0;hp=5fd825361ec9154026a1ecba1c203b6c50ee7093;hpb=661a63b6b427ace7e1501dc9101f2c8432b0ab5d;p=ghc-hetmet.git

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 5fd8253..bd09ad1 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -20,7 +20,10 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
 #				   configure-time
 #   - SRC_HC_OPTS                  source-tree-wide options from build.mk
 #				   (optimisation, heap settings)
-#   - libraries/base_HC_OPTS       options from libraries/base for all ways
+#   - libraries/base_HC_OPTS       options from Cabal for libraries/base
+#                                  for all ways
+#   - libraries/base_MORE_HC_OPTS  options from elsewhere in the build
+#                                  system for 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
 #   - EXTRA_HC_OPTS                options from the command-line
@@ -48,6 +51,7 @@ $1_$2_$3_MOST_HC_OPTS = \
  $$(foreach pkg,$$($1_$2_DEPS),-package $$(pkg)) \
  $$(if $$(findstring YES,$$($1_$2_SplitObjs)),$$(if $$(findstring dyn,$3),,-split-objs),) \
  $$($1_$2_HC_OPTS) \
+ $$($1_$2_MORE_HC_OPTS) \
  $$($1_$2_EXTRA_HC_OPTS) \
  $$($1_$2_$3_HC_OPTS) \
  $$($$(basename $$<)_HC_OPTS) \
@@ -105,7 +109,7 @@ $1_$2_DIST_LD_LIB_DIRS:=$$(shell for i in $$($1_$2_DEP_LIB_DIRS); do echo \"-L$$
 endif
 
 $1_$2_DIST_LD_OPTS = \
- $$(CONF_LD_OPTS_STAGE$4) \
+ $$(CONF_GCC_LINKER_OPTS_STAGE$4) \
  $$(SRC_LD_OPTS) \
  $$($1_LD_OPTS) \
  $$($1_$2_LD_OPTS) \