X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=be09d355fb21ca5a3f31c6ddd73d780ff02ca2d4;hb=1322d0f3bcca779720ce9e6b9014f575435631c0;hp=4797814b5e00df3c49845c99d1b80df45a1929e5;hpb=9c5a3913f8dec019875b03ce6dce370b7e9920de;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 4797814..be09d35 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -272,6 +272,11 @@ endif @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) @echo "cDocDir = \"$(docdir)\"" >> $(CONFIG_HS) +ifeq "$(RelocatableBuild)" "YES" + @echo "cRelocatableBuild = True" >> $(CONFIG_HS) +else + @echo "cRelocatableBuild = False" >> $(CONFIG_HS) +endif @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -741,17 +746,17 @@ INPLACE_SRC = $(odir)/ghc-inplace.c INPLACE_PROG = $(odir)/ghc-inplace$(_way)$(exeext) EXCLUDED_C_SRCS += ghc-inplace.c +CLEAN_FILES += $(INPLACE_SRC) + GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" INPLACE_EXTRA_FLAGS = -optc-DWINDOWS endif -$(INPLACE_SRC): ghc-inplace.c - $(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $@ - -$(INPLACE_PROG): $(INPLACE_SRC) - $(HC) -cpp $(INPLACE_EXTRA_FLAGS) $< -o $@ +$(INPLACE_PROG): ghc-inplace.c + $(SED) -e "s@GHC_PATH@$(GHC_PATH)@g" -e "s@TOP_ABS@$(FPTOOLS_TOP_ABS)@g" < $< > $(INPLACE_SRC) + $(HC) -cpp $(INPLACE_EXTRA_FLAGS) $(INPLACE_SRC) -o $@ all :: $(INPLACE_PROG)