diff options
author | Ian Lynagh <igloo@earth.li> | 2009-01-08 16:11:00 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2009-01-08 16:11:00 +0000 |
commit | 2117cc225db601eed5a75f51a4ee499d2dd0a3bb (patch) | |
tree | 863b1256750d8cb7c0c8ab456141ec7d00685583 /testsuite/timeout/Makefile | |
parent | e6fc6a9c2e9355f981f34ac9be8a5061a07a7bda (diff) | |
download | haskell-2117cc225db601eed5a75f51a4ee499d2dd0a3bb.tar.gz |
Disentangle the testsuite from the compiler's build system
Diffstat (limited to 'testsuite/timeout/Makefile')
-rw-r--r-- | testsuite/timeout/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/testsuite/timeout/Makefile b/testsuite/timeout/Makefile index b9f87fe746..6277009dbf 100644 --- a/testsuite/timeout/Makefile +++ b/testsuite/timeout/Makefile @@ -1,22 +1,23 @@ -TOP = ../.. +TOP = .. include $(TOP)/mk/boilerplate.mk -include $(TOP)/mk/cabal-flags.mk TIMEOUT_PROGRAM = install-inplace/bin/timeout$(exeext) -ifeq "$(findstring thr,$(GhcRTSWays))" "" +ifeq "$(filter thr, $(GhcRTSWays))" "" $(TIMEOUT_PROGRAM): timeout.py - $(MKDIRHIER) `dirname $@` + rm -rf install-inplace + mkdir install-inplace + mkdir install-inplace/bin cp $< $@ chmod +x $@ else $(TIMEOUT_PROGRAM): timeout.hs - $(CABAL) configure $(USE_STAGE1_CONFIGURE_FLAGS) \ - $(INPLACE_DIRS_CONFIGURE_FLAGS) \ - $(COMMON_CONFIGURE_FLAGS) \ - --ghc-option=-threaded - $(CABAL) build - $(CABAL) install + rm -rf install-inplace + $(TEST_HC) --make Setup + ./Setup configure --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG) \ + --ghc-option=-threaded --prefix=$(abspath install-inplace) + ./Setup build + ./Setup install endif boot all :: calibrate.out $(TIMEOUT_PROGRAM) |