[commit: ghc] master: Use the automatic variables for touchy too (8640750)

Ian Lynagh igloo at earth.li
Mon Mar 4 01:45:04 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8640750e136f98767fc0678b35a20a6fb7970241

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

commit 8640750e136f98767fc0678b35a20a6fb7970241
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 3 22:37:57 2013 +0000

    Use the automatic variables for touchy too

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

 ghc/ghc.mk      | 6 +++---
 mk/config.mk.in | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 292ae92..3466b51 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -156,9 +156,9 @@ $(GHC_STAGE3) : | $$(ghc-split_INPLACE)
 endif
 
 ifeq "$(Windows_Host)" "YES"
-$(GHC_STAGE1) : | $(TOUCHY)
-$(GHC_STAGE2) : | $(TOUCHY)
-$(GHC_STAGE3) : | $(TOUCHY)
+$(GHC_STAGE1) : | $$(touchy_INPLACE)
+$(GHC_STAGE2) : | $$(touchy_INPLACE)
+$(GHC_STAGE3) : | $$(touchy_INPLACE)
 endif
 
 endif
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5cd1667..16faa95 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -434,7 +434,6 @@ SRC_FLEX_OPTS	+= -8
 #      xxx_PGM          the name of an executable, without the path
 #      xxx              the executable relative to the current dir
 
-TOUCHY              = $(INPLACE_LIB)/touchy$(exeext)
 MKDIRHIER           = $(INPLACE_BIN)/mkdirhier
 
 GENERATED_FILE  = chmod a-w





More information about the ghc-commits mailing list