[commit: ghc] master: Fix ohi-sanity-check when we have ways other than v and dyn enabled (24be4bc)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/24be4bcbb9d9b44efeb3f956fd65c8b07e80ca97

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

commit 24be4bcbb9d9b44efeb3f956fd65c8b07e80ca97
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 17 15:42:20 2013 +0000

    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.

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

 rules/hs-suffix-way-rules-srcdir.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rules/hs-suffix-way-rules-srcdir.mk b/rules/hs-suffix-way-rules-srcdir.mk
index 466b631..eff4954 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; \