diff options
author | Ian Lynagh <igloo@earth.li> | 2012-07-24 15:46:55 +0100 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2012-07-24 15:46:55 +0100 |
commit | f95ced2635e0f29fd1b7fe76d44711ef0d236cb4 (patch) | |
tree | 6f7bc038ddff1cb761e8ff3c5cd95f757cdf49ae /rules/distdir-way-opts.mk | |
parent | 1d15ada47b88601e5442c6be167f5f804f22a654 (diff) | |
download | haskell-f95ced2635e0f29fd1b7fe76d44711ef0d236cb4.tar.gz |
Tweak the HC_OPTS generation
libraries/base/GHC/Base_HC_OPTS wasn't getting included, because we
were using libraries/base/./GHC/Base.lhs as the path, and the ./
meant we got the wrong filename.
I didn't use $(realpath ...) as the .hs file may be generated by hsc2hs
or similar, so may not exist when the HC_OPTS are constructed.
Diffstat (limited to 'rules/distdir-way-opts.mk')
-rw-r--r-- | rules/distdir-way-opts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index bbd37d1ee1..ed2a4d0b27 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -105,7 +105,7 @@ $1_$2_$3_MOST_HC_OPTS = \ $$($1_$2_MORE_HC_OPTS) \ $$($1_$2_EXTRA_HC_OPTS) \ $$($1_$2_$3_HC_OPTS) \ - $$($$(basename $$<)_HC_OPTS) \ + $$($$(basename $$(subst ./,,$$<))_HC_OPTS) \ $$(SRC_HC_WARNING_OPTS) \ $$(EXTRA_HC_OPTS) |