diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-09-06 12:20:36 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-09-06 12:20:36 +0000 |
| commit | c140c1415a91991c617f8ba153b54e6e69cf9640 (patch) | |
| tree | 0f98d50cbf17bd315eae612f8b459f361a3b1a8f /utils/ghc-pkg/Makefile | |
| parent | b7f448a4ebb2b924f279bf49432f07338f41a764 (diff) | |
| download | haskell-c140c1415a91991c617f8ba153b54e6e69cf9640.tar.gz | |
Remove hardtop_plat/FPTOOLS_TOP_ABS_PLATFORM
They are now the same as hardtop/FPTOOLS_TOP_ABS, so use those instead.
Also removed some substitutions of / for \, as we now use a Haskell
program to find the top path, and it only makes paths with /s in.
Diffstat (limited to 'utils/ghc-pkg/Makefile')
| -rw-r--r-- | utils/ghc-pkg/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index 67ed7ceb0c..d456750c3a 100644 --- a/utils/ghc-pkg/Makefile +++ b/utils/ghc-pkg/Makefile @@ -65,13 +65,9 @@ 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; import System.Exit" > $@ - echo "main = do args <- getArgs; rawSystem \"$(TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(TOP_ABS)/driver/package.conf.inplace\":args) >>= exitWith" >> $@ + echo "main = do args <- getArgs; rawSystem \"$(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(FPTOOLS_TOP_ABS)/driver/package.conf.inplace\":args) >>= exitWith" >> $@ $(INPLACE_PROG): $(INPLACE_HS) $(HC) --make $< -o $@ |