X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=4023d72eb24e642f6e525deba35ebac412ea9fea;hb=9c5675a3f32ba9d3e8d66c43773a24d30cd4dec8;hp=e85706baf1204b02142f7147fa13eff241154180;hpb=db7a768882134defdd282bd626b29bead6e62b00;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index e85706b..4023d72 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -204,7 +204,7 @@ endif CONFIG_HS = main/Config.hs boot :: $(CONFIG_HS) -$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile +$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @$(RM) -f $(CONFIG_HS) @echo "Creating $(CONFIG_HS) ... " @echo "module Config where" >>$(CONFIG_HS) @@ -261,7 +261,7 @@ CLEAN_FILES += $(CONFIG_HS) PLATFORM_H = ghc_boot_platform.h -stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile +stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk @echo "Creating $@..." @$(RM) $@ @echo "#ifndef __PLATFORM_H__" >$@ @@ -307,7 +307,7 @@ endif # For stage2 and above, the BUILD platform is the HOST of stage1, and # the HOST platform is the TARGET of stage1. The TARGET remains the same # (stage1 is the cross-compiler, not stage2). -stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk Makefile +stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk @echo "Creating $@..." @$(RM) $@ @echo "#ifndef __PLATFORM_H__" >$@ @@ -709,9 +709,8 @@ 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. -INPLACE_C = ghc-inplace.c INPLACE_PROG = $(odir)/ghc-inplace$(exeext) -EXCLUDED_SRCS += $(INPLACE_C) +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. @@ -719,7 +718,7 @@ TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM)) GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG) -$(INPLACE_PROG): $(INPLACE_C) +$(INPLACE_PROG): ghc-inplace.c $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $< -o $@ all :: $(INPLACE_PROG) @@ -1005,4 +1004,10 @@ endif # -optdep--exclude-module flag in GHC 6.4. It is not required for any # other version of GHC, but doesn't do any harm. +ifeq "$(MakefileDeps)" "YES" +$(CONFIG_HS) : Makefile +stage1/$(PLATFORM_H) : Makefile +stage2/$(PLATFORM_H) : Makefile +endif + -include .depend-$(stage)