diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-01-20 10:49:22 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-01-20 10:49:22 +0000 |
| commit | deeeacb8102882978e942cc14f71365aa3701f7e (patch) | |
| tree | 04556d9d2db9af3c23ed81d3d175c4f3ae9f9467 /testsuite/mk | |
| parent | 898eca999b4e265ad59f8fb410165da133d386da (diff) | |
| download | haskell-deeeacb8102882978e942cc14f71365aa3701f7e.tar.gz | |
Fix for Windows, and delete the .mk file if ghc-config fails
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index dd5be687a0..bac5e3b050 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -140,10 +140,10 @@ $(TOP_ABS)/mk/ghc-config : $(TOP_ABS)/mk/ghc-config.hs empty= space=$(empty) $(empty) -ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC)))).mk +ghc-config-mk = $(TOP_ABS)/mk/ghcconfig$(subst :,_,$(subst $(space),_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk $(ghc-config-mk) : $(TOP_ABS)/mk/ghc-config - $(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@" || $(RM) "$@" + $(TOP_ABS)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) -f "$@"; exit 1; fi include $(ghc-config-mk) |