X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=f3cd6eaca280fb18a68c8a6b2a2dbf73f4cc9320;hb=c140c1415a91991c617f8ba153b54e6e69cf9640;hp=5ca2c2dbb253ae0de5e0c5f30adcfa9e340bb9f9;hpb=aacbb9918d5458df0a64231bb55976679e471b91;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 5ca2c2d..f3cd6ea 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -27,6 +27,7 @@ ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES" $(error Cannot make GHC both threaded and profiled) endif + #----------------------------------------------------------------------------- # Counting source code lines @@ -89,6 +90,16 @@ ifeq "$(stage)" "" stage=1 endif +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifeq "$(stage)" "1" +DQ = \" +else +DQ = \\\" +endif +else +DQ = \" +endif + .DUMMY: stage_dir stage_dirs : $(MKDIRHIER) stage$(stage) @@ -154,6 +165,8 @@ odir=stage$(stage) SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) +SRC_HC_OPTS += -Wall -fno-warn-name-shadowing + HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS)))) @@ -204,9 +217,10 @@ 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 "{-# OPTIONS -w #-}" >>$(CONFIG_HS) @echo "module Config where" >>$(CONFIG_HS) @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @@ -215,7 +229,11 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) @echo "cStage = STAGE" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) + @echo "cSplitObjs = \"$(SplitObjs)\"" >> $(CONFIG_HS) + @echo "cGhcWithInterpreter = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) + @echo "cGhcWithSMP = \"$(GhcWithSMP)\"" >> $(CONFIG_HS) + @echo "cGhcRTSWays = \"$(GhcRTSWays)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @@ -247,6 +265,7 @@ endif @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) + @echo "cDocDir = \"$(docdir)\"" >> $(CONFIG_HS) @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -261,7 +280,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 +326,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__" >$@ @@ -433,6 +452,9 @@ endif ifeq "$(GhcProfiled)" "YES" SRC_LD_OPTS += -prof endif +ifeq "$(GhcDebugged)" "YES" +SRC_LD_OPTS += -debug +endif ALL_DIRS += ghci @@ -709,32 +731,21 @@ 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_HS = $(odir)/ghc-inplace.hs INPLACE_PROG = $(odir)/ghc-inplace$(exeext) -EXCLUDED_SRCS += $(INPLACE_HS) +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=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) -ifeq "$(stage)" "1" -EnvImport = System.Environment -GetArgs = getArgs -else -EnvImport = GHC.Environment -GetArgs = getFullArgs +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +INPLACE_EXTRA_FLAGS = -optc-DWINDOWS endif -$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk - echo "import System.Cmd; import $(EnvImport); import System.Exit" > $@ - echo "main = do args <- $(GetArgs); rawSystem \"$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)\" (\"-B$(TOP_ABS)\":\"-fhardwire-lib-paths\":args) >>= exitWith" >> $@ - -$(INPLACE_PROG): $(INPLACE_HS) - $(HC) --make $< -o $@ +$(INPLACE_PROG): ghc-inplace.c + $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(FPTOOLS_TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@ all :: $(INPLACE_PROG) -CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG) +CLEAN_FILES += $(INPLACE_PROG) ifeq "$(stage)" "1" ghc-inplace : $(INPLACE_PROG) @@ -801,7 +812,7 @@ endif # typecheck/TcType_HC_OPTS += -auto-all # typecheck/TcUnify_HC_OPTS += -auto-all -coreSyn/CorePrep_HC_OPTS += -auto-all +# coreSyn/CorePrep_HC_OPTS += -auto-all # parser/Parser_HC_OPTS += -fasm #----------------------------------------------------------------------------- @@ -918,7 +929,7 @@ all :: $(GHC_PROG) endif endif -$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' +$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ) #----------------------------------------------------------------------------- # binary-dist @@ -1015,4 +1026,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)