diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-05 10:28:12 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-05 10:28:12 +0000 |
| commit | 0d049c057972577e13ee88a99b595b57320fa7e9 (patch) | |
| tree | 294e12b9e418e978b7193fe5ededb17975af0af2 /testsuite/mk | |
| parent | 98479d6586fdc503a87e0cf49572ae2e5276bc29 (diff) | |
| download | haskell-0d049c057972577e13ee88a99b595b57320fa7e9.tar.gz | |
Wibbles to testsuite/mk/boilerplate.mk
...after consulting with Simon M on a conflict
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 4c58a1cf10..ad794985f5 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/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) |