diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-17 15:42:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-17 15:42:20 +0000 |
| commit | 24be4bcbb9d9b44efeb3f956fd65c8b07e80ca97 (patch) | |
| tree | 6583180e5644dd5ae85b625d59f5d524cdd9d8ce /rules | |
| parent | c3a9ded019b5dfd3b6fa6753c4a282c3a47c1524 (diff) | |
| download | haskell-24be4bcbb9d9b44efeb3f956fd65c8b07e80ca97.tar.gz | |
Fix ohi-sanity-check when we have ways other than v and dyn enabled
It thought that /all/ ways should create the dyn o/hi files, but only
the v way does.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/hs-suffix-way-rules-srcdir.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rules/hs-suffix-way-rules-srcdir.mk b/rules/hs-suffix-way-rules-srcdir.mk index 466b631540..eff49543f3 100644 --- a/rules/hs-suffix-way-rules-srcdir.mk +++ b/rules/hs-suffix-way-rules-srcdir.mk @@ -73,7 +73,11 @@ else # We don't look for the .hi file if this is for a program, as if the # Main module is in foo.hs then we get foo.o but Main.hi define ohi-sanity-check - @for f in $4.$($3_osuf) $(if $($1_$2_PROG),,$4.$($3_hisuf)) $(if $(findstring YES,$($1_$2_DYNAMIC_TOO)),$4.$(dyn_osuf) $4.$(dyn_hisuf)); do \ + @for f in $4.$($3_osuf) \ + $(if $($1_$2_PROG),,$4.$($3_hisuf)) \ + $(if $(findstring v,$3), \ + $(if $(findstring YES,$($1_$2_DYNAMIC_TOO)), \ + $4.$(dyn_osuf) $4.$(dyn_hisuf))); do \ if [ ! -f $$f ]; then \ echo "Panic! $$f not created."; \ exit 1; \ |