X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=f3cd6eaca280fb18a68c8a6b2a2dbf73f4cc9320;hp=dd96bff2dda18dd2adde0e8a68ca1aef77d5811c;hb=c140c1415a91991c617f8ba153b54e6e69cf9640;hpb=b7f448a4ebb2b924f279bf49432f07338f41a764 diff --git a/compiler/Makefile b/compiler/Makefile index dd96bff..f3cd6ea 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -734,18 +734,14 @@ SRC_LD_OPTS += -no-link-chk INPLACE_PROG = $(odir)/ghc-inplace$(exeext) EXCLUDED_C_SRCS += ghc-inplace.c -# 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)) - -GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) +GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" INPLACE_EXTRA_FLAGS = -optc-DWINDOWS endif $(INPLACE_PROG): ghc-inplace.c - $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@ + $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(FPTOOLS_TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@ all :: $(INPLACE_PROG)