diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-06-21 11:41:47 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-06-21 11:41:47 +0000 |
| commit | 4a88ae96833c8f7b18de46c29e805bb53f8b5669 (patch) | |
| tree | 193f5eee84a9497832daf518310656cedce3e104 /utils/ghc-pkg/Makefile | |
| parent | 07ea55410545ef68074e7ae94516e93bd88e26bb (diff) | |
| download | haskell-4a88ae96833c8f7b18de46c29e805bb53f8b5669.tar.gz | |
Fix problems with new inplace stuff on Cygwin
Diffstat (limited to 'utils/ghc-pkg/Makefile')
| -rw-r--r-- | utils/ghc-pkg/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index bb140f56e5..3a8cfdfba4 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 $@ |