Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/437b5a2485e2af755d2605d8b4f3b62084ae188e

>---------------------------------------------------------------

commit 437b5a2485e2af755d2605d8b4f3b62084ae188e
Author: Ian Lynagh <[email protected]>
Date:   Wed Jul 13 19:52:07 2011 +0100

    TH doesn't work in a stage 1 compiler

>---------------------------------------------------------------

 mk/test.mk |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/mk/test.mk b/mk/test.mk
index 2e2b8d0..4ca1c4e 100644
--- a/mk/test.mk
+++ b/mk/test.mk
@@ -69,11 +69,14 @@ else
 RUNTEST_OPTS += -e ghc_with_dynamic_rts=0
 endif
 
+$(eval $(call get-ghc-field,GhcStage,Stage))
 $(eval $(call get-ghc-feature-bool,GhcWithInterpreter,Have interpreter))
-ifeq "$(GhcWithInterpreter)" "YES"
-RUNTEST_OPTS += -e ghc_with_interpreter=1
-else
+ifeq "$(GhcWithInterpreter)" "NO"
+RUNTEST_OPTS += -e ghc_with_interpreter=0
+else ifeq "$(GhcStage)" "1"
 RUNTEST_OPTS += -e ghc_with_interpreter=0
+else
+RUNTEST_OPTS += -e ghc_with_interpreter=1
 endif
 
 $(eval $(call get-ghc-feature-bool,GhcUnregisterised,Unregisterised))



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to