diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-01-14 19:16:21 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-01-14 19:16:21 +0000 |
| commit | 080376c39618bfd3ad4b2a33298fce083a634342 (patch) | |
| tree | dc886598979e6bca022d4bde76509dea65836e5a /testsuite/timeout/Makefile | |
| parent | 0bb2b537f7b104e1665db6d5c4a4fcc925695c21 (diff) | |
| download | haskell-080376c39618bfd3ad4b2a33298fce083a634342.tar.gz | |
Move the Makefile changes around so they don't cause test failures
Our "make clean" detection was causing problems for tests which had
their own local clean target.
Diffstat (limited to 'testsuite/timeout/Makefile')
| -rw-r--r-- | testsuite/timeout/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/testsuite/timeout/Makefile b/testsuite/timeout/Makefile index 044e52c68f..8acc229a4a 100644 --- a/testsuite/timeout/Makefile +++ b/testsuite/timeout/Makefile @@ -1,4 +1,13 @@ TOP = .. + +# If we're cleaning then we don't want to do all the GHC detection hardwork, +# and we certainly don't want to fail if GHC etc can't be found! +# However, we can't just put this conditional in boilerplate.mk, as +# some of the tests have a "clean" makefile target that relies on GHC_PKG +# being defined. +ifneq "$(MAKECMDGOALS)" "clean" +ifneq "$(MAKECMDGOALS)" "distclean" + include $(TOP)/mk/boilerplate.mk TIMEOUT_PROGRAM = install-inplace/bin/timeout$(exeext) @@ -30,6 +39,9 @@ calibrate.out: # with, but it's really the performance of the machine that we're # interested in +endif +endif + clean distclean: -./Setup clean $(RM) -rf install-inplace |