diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-10-15 12:22:25 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-10-15 12:22:25 +0000 |
| commit | f84a0b7028424ea167658c06e75e871198371f00 (patch) | |
| tree | b52d160b3360d8c3d3408c8148d713c27f9eed68 /rules/distdir-way-opts.mk | |
| parent | f031f894049111ff14d35b3e1c2dc6c97a31f1a8 (diff) | |
| download | haskell-f84a0b7028424ea167658c06e75e871198371f00.tar.gz | |
Tweak to the way per-source-file options are specified
Diffstat (limited to 'rules/distdir-way-opts.mk')
| -rw-r--r-- | rules/distdir-way-opts.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index fc805979e8..11d64c0ef7 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 = \ |