summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-03-03 22:37:57 +0000
committerIan Lynagh <ian@well-typed.com>2013-03-03 22:37:57 +0000
commit8640750e136f98767fc0678b35a20a6fb7970241 (patch)
tree047e9c40f0b33614358ca4925714709f28699a9e
parent7cef4375e696fd226399ea2b22efef0927680e8e (diff)
downloadhaskell-8640750e136f98767fc0678b35a20a6fb7970241.tar.gz
Use the automatic variables for touchy too
-rw-r--r--ghc/ghc.mk6
-rw-r--r--mk/config.mk.in1
2 files changed, 3 insertions, 4 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 292ae92cfa..3466b51e6f 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 5cd1667cc7..16faa95e68 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