From 4a88ae96833c8f7b18de46c29e805bb53f8b5669 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Thu, 21 Jun 2007 11:41:47 +0000 Subject: [PATCH] Fix problems with new inplace stuff on Cygwin --- compiler/Makefile | 7 ++++++- utils/ghc-pkg/Makefile | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 536ed0f..9b24c78 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -706,10 +706,15 @@ all :: $(odir)/ghc-inplace ghc-inplace INPLACE_HS = $(odir)/ghc-inplace.hs INPLACE_PROG = $(odir)/ghc-inplace$(exeext) +EXCLUDED_SRCS += $(INPLACE_HS) + +# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that +# will go wrong when we use it in a Haskell string below. +TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM)) $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk echo "import System.Cmd; import System.Environment" > $@ - echo "main = getArgs >>= \args -> rawSystem \"$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(FPTOOLS_TOP_ABS_PLATFORM)\":args)" >> $@ + echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args)" >> $@ $(INPLACE_PROG): $(INPLACE_HS) $(GHC) --make $< -o $@ diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index bb140f5..3a8cfdf 100644 --- a/utils/ghc-pkg/Makefile +++ b/utils/ghc-pkg/Makefile @@ -59,10 +59,15 @@ DIST_CLEAN_FILES += $(VERSION_HS) INPLACE_HS=ghc-pkg-inplace.hs INPLACE_PROG=ghc-pkg-inplace +EXCLUDED_SRCS+=$(INPLACE_HS) + +# FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that +# will go wrong when we use it in a Haskell string below. +TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM)) $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk echo "import System.Cmd; import System.Environment" > $@ - echo "main = getArgs >>= \args -> rawSystem \"$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(FPTOOLS_TOP_ABS_PLATFORM)/driver/package.conf.inplace\":args)" >> $@ + echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(TOP_ABS)/driver/package.conf.inplace\":args)" >> $@ $(INPLACE_PROG): $(INPLACE_HS) $(GHC) --make $< -o $@ -- 1.7.10.4