Commit ee58865d authored by David Himmelstrup's avatar David Himmelstrup
Browse files

further fixes to the inplace scripts

parent e2697851
......@@ -702,8 +702,6 @@ SRC_LD_OPTS += -no-link-chk
# See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use
# a real binary here rather than a shell script.
all :: $(odir)/ghc-inplace ghc-inplace
INPLACE_HS = $(odir)/ghc-inplace.hs
INPLACE_PROG = $(odir)/ghc-inplace$(exeext)
EXCLUDED_SRCS += $(INPLACE_HS)
......@@ -713,8 +711,8 @@ EXCLUDED_SRCS += $(INPLACE_HS)
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 \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args)" >> $@
echo "import System.Cmd; import System.Environment; import System.Exit" > $@
echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":args) >>= exitWith" >> $@
$(INPLACE_PROG): $(INPLACE_HS)
$(GHC) --make $< -o $@
......@@ -727,6 +725,8 @@ ifeq "$(stage)" "1"
ghc-inplace : $(INPLACE_PROG)
$(RM) -f $@ && $(LN_S) $< $@
all :: ghc-inplace
CLEAN_FILES += ghc-inplace
endif
......
......@@ -66,8 +66,8 @@ EXCLUDED_SRCS+=$(INPLACE_HS)
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 \"$(TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(TOP_ABS)/driver/package.conf.inplace\":args)" >> $@
echo "import System.Cmd; import System.Environment; import System.Exit" > $@
echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_PKG_DIR_REL)/$(HS_PROG)\" (\"--global-conf\":\"$(TOP_ABS)/driver/package.conf.inplace\":args) >>= exitWith" >> $@
$(INPLACE_PROG): $(INPLACE_HS)
$(GHC) --make $< -o $@
......
......@@ -44,8 +44,8 @@ extra_flags=
endif
$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
echo "import System.Cmd; import System.Environment" > $@
echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--cc=$(CC)\":\"--ld=$(LD)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_INCLUDE_DIR_REL)\":args)" >> $@
echo "import System.Cmd; import System.Environment; import System.Exit" > $@
echo "main = getArgs >>= \args -> rawSystem \"$(TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--cc=$(CC)\":\"--ld=$(LD)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_INCLUDE_DIR_REL)\":args) >>= exitWith" >> $@
$(INPLACE_PROG): $(INPLACE_HS)
$(GHC) --make $< -o $@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment