[commit: testsuite] master: fix (non-fast) validate (dcdbb96)

Simon Marlow marlowsd at gmail.com
Tue Jan 17 13:38:12 CET 2012


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

On branch  : master

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

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

commit dcdbb9609542267b26ef6208a98fd451ca96c00f
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Jan 17 12:25:28 2012 +0000

    fix (non-fast) validate

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

 mk/boilerplate.mk |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 881e8d7..dd5be68 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -138,10 +138,12 @@ PYTHON = python
 $(TOP_ABS)/mk/ghc-config : $(TOP_ABS)/mk/ghc-config.hs
 	"$(TEST_HC)" --make -o $@ $<
 
-ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst /,_,$(subst \,_,$(TEST_HC))).mk
+empty=
+space=$(empty) $(empty)
+ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC)))).mk
 
 $(ghc-config-mk) : $(TOP_ABS)/mk/ghc-config
-	$(TOP_ABS)/mk/ghc-config $(TEST_HC) >$@
+	$(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@" || $(RM) "$@"
 
 include $(ghc-config-mk)
 





More information about the Cvs-ghc mailing list