[commit: ghc] master: Tweak the HC_OPTS generation (f95ced2)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f95ced2635e0f29fd1b7fe76d44711ef0d236cb4

>---------------------------------------------------------------

commit f95ced2635e0f29fd1b7fe76d44711ef0d236cb4
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Jul 24 15:46:55 2012 +0100

    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.

>---------------------------------------------------------------

 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 bbd37d1..ed2a4d0 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)