X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fdistdir-way-opts.mk;h=11d64c0ef72d2b697bbca43378dd7f7c73eb0f34;hp=fc805979e82f42223772ddf641a75084c36b8e85;hb=f84a0b7028424ea167658c06e75e871198371f00;hpb=f031f894049111ff14d35b3e1c2dc6c97a31f1a8

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index fc80597..11d64c0 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -50,7 +50,7 @@ $1_$2_$3_MOST_HC_OPTS = \
  $$($1_$2_HC_OPTS) \
  $$($1_$2_EXTRA_HC_OPTS) \
  $$($1_$2_$3_HC_OPTS) \
- $$($$*_HC_OPTS) \
+ $$($$(basename $$<)_HC_OPTS) \
  $$(EXTRA_HC_OPTS)
 
 # For real Haskell compilations we add -hidir etc.
@@ -107,14 +107,14 @@ $1_$2_$3_ALL_HSC2HS_OPTS = \
  --cflag=-D__GLASGOW_HASKELL__=$$(ProjectVersionInt) \
  $$(foreach opt,$$($1_$2_DIST_CC_OPTS),'--cflag=$$(opt)') \
  $$(foreach opt,$$($1_$2_DIST_LD_OPTS),'--lflag=$$(opt)') \
- $$($$*_HSC2HS_OPTS) \
+ $$($$(basename $$<)_HSC2HS_OPTS) \
  $$(EXTRA_HSC2HS_OPTS)
 
 $1_$2_$3_ALL_CC_OPTS = \
  $$(WAY_$3_CC_OPTS) \
  $$($1_$2_DIST_CC_OPTS) \
  $$($1_$2_$3_CC_OPTS) \
- $$($$*_CC_OPTS) \
+ $$($$(basename $$<)_CC_OPTS) \
  $$(EXTRA_CC_OPTS)
 
 $1_$2_$3_GHC_CC_OPTS = \