[commit: ghc] master: Revert "GHC_STAGE1 isn't defined, use other form." (ad19104)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ad191042896ca0b31277e5192ef4acec63bc176a/ghc

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

commit ad191042896ca0b31277e5192ef4acec63bc176a
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Mar 17 19:33:53 2017 -0700

    Revert "GHC_STAGE1 isn't defined, use other form."
    
    This reverts commit 138434fbef32ec86733747bdbc57f6da73cad500.


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

ad191042896ca0b31277e5192ef4acec63bc176a
 testsuite/timeout/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/timeout/Makefile b/testsuite/timeout/Makefile
index 9626eae..b910a73 100644
--- a/testsuite/timeout/Makefile
+++ b/testsuite/timeout/Makefile
@@ -51,7 +51,7 @@ boot all :: calibrate.out $(TIMEOUT_PROGRAM)
 
 calibrate.out:
 	$(RM) -f TimeMe.o TimeMe.hi TimeMe TimeMe.exe
-	$(PYTHON) calibrate '$(STAGE1_GHC)' > $@
+	$(PYTHON) calibrate '$(GHC_STAGE1)' > $@
 # We use stage 1 to do the calibration, as stage 2 may not exist.
 # This isn't necessarily the compiler we'll be running the testsuite
 # with, but it's really the performance of the machine that we're