Commit 080376c3 authored by Ian Lynagh's avatar Ian Lynagh

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.
parent 0bb2b537
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
boot:
......@@ -7,6 +17,9 @@ boot:
all:
$(MAKE) -C $(TOP)/tests/ghc-regress all
endif
endif
clean distclean:
$(MAKE) -C $(TOP)/timeout $@
default: all
# 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!
ifneq "$(MAKECMDGOALS)" "clean"
ifneq "$(MAKECMDGOALS)" "distclean"
HAVE_EVAL := NO
$(eval HAVE_EVAL := YES)
......@@ -109,6 +104,3 @@ CP = cp
RM = rm -f
PYTHON = python
endif
endif
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment