diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-02 20:06:35 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-03-02 20:06:35 +0000 |
| commit | 3b9c6514a50e453e74f9fba6dea1b2a7a5dcfab0 (patch) | |
| tree | a6165c8c8edcfc3274f8c536b07eeff87450393d /testsuite/mk | |
| parent | 48ba35e032dc85f2f38d7d7c3c41cffdac1dce5d (diff) | |
| parent | 05b18ad0a57528f4fcf0e9608a03a9b180060710 (diff) | |
| download | haskell-3b9c6514a50e453e74f9fba6dea1b2a7a5dcfab0.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org//testsuite
Conflicts:
mk/boilerplate.mk
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index bac5e3b050..4c58a1cf10 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -45,7 +45,7 @@ ifneq "$(wildcard $(STAGE1_GHC) $(STAGE1_GHC).exe)" "" IN_TREE_COMPILER = YES ifeq "$(BINDIST)" "YES" -TEST_HC := $(abspath $(TOP)/../)/bindisttest/install dir/bin/ghc +TEST_HC := $(abspath $(TOP)/../)/bindisttest/install dir/bin/ghc else ifeq "$(stage)" "1" TEST_HC := $(STAGE1_GHC) else ifeq "$(stage)" "3" @@ -120,6 +120,9 @@ ifeq "$(AR)" "" AR = ar endif +# Be careful when using this. On Windows it ends up looking like +# c:/foo/bar which confuses make, as make thinks that the : is Makefile +# syntax TOP_ABS := $(abspath $(TOP)) $(eval $(call canonicalise,TOP_ABS)) @@ -135,7 +138,7 @@ PYTHON = python # the results, and emits a little .mk file with make bindings for the values. # This way we cache the results for different values of $(TEST_HC) -$(TOP_ABS)/mk/ghc-config : $(TOP_ABS)/mk/ghc-config.hs +$(TOP)/mk/ghc-config : $(TOP)/mk/ghc-config.hs "$(TEST_HC)" --make -o $@ $< empty= |