Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7dcc1bfc3edf2d3ad158e339dcb0402b5332f43c >--------------------------------------------------------------- commit 7dcc1bfc3edf2d3ad158e339dcb0402b5332f43c Author: Simon Peyton Jones <[email protected]> Date: Mon Mar 5 10:28:12 2012 +0000 Wibbles to testsuite/mk/boilerplate.mk ...after consulting with Simon M on a conflict >--------------------------------------------------------------- mk/boilerplate.mk | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk index 4c58a1c..ad79498 100644 --- a/mk/boilerplate.mk +++ b/mk/boilerplate.mk @@ -143,10 +143,11 @@ $(TOP)/mk/ghc-config : $(TOP)/mk/ghc-config.hs empty= space=$(empty) $(empty) -ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst :,_,$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk +ghc-config-mk = $(TOP)/mk/ghcconfig$(subst $(space),_,$(subst :,_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk -$(ghc-config-mk) : $(TOP_ABS)/mk/ghc-config - $(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) -f "$@"; exit 1; fi +$(ghc-config-mk) : $(TOP)/mk/ghc-config + $(TOP)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) "$@"; exit 1; fi +# If the ghc-config fails, remove $@, and fail include $(ghc-config-mk) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
