X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=4691689617e68b942da8f9f1d1297137c0ec2dda;hb=66ae738380ec31be4a721e1ae594c08e71a5b800;hp=3f443acf3d07d630337d6474e7ce0bf9b04488bf;hpb=af2db474c2bb80e29924430e3c730bc217e55189;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 3f443ac..4691689 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -21,12 +21,18 @@ TOP = .. # UseGhcForCc = YES +# We don't want to compile stage1 in multiple ways +ifeq "$(findstring $(stage), 2 3)" "" +WAYS= +endif + include $(TOP)/mk/boilerplate.mk ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES" $(error Cannot make GHC both threaded and profiled) endif + #----------------------------------------------------------------------------- # Counting source code lines @@ -89,6 +95,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,13 +170,20 @@ odir=stage$(stage) SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) +SRC_HC_OPTS += -Wall -fno-warn-name-shadowing +# Turn off orphan warnings, but only if the flag exists (i.e. not if we +# are building stage 1 and using GHC < 6.3). +ifneq "$(stage) $(ghc_ge_603)" "1 NO" +SRC_HC_OPTS += -fno-warn-orphans +endif + HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS)))) # Our standard cleaning rules don't know that we're doing our output # into $(odir), so we have to augment CLEAN_FILES appropriateliy. -CLEAN_FILES += $(odir)/*/*.hi $(odir)/*/*.hi-boot $(odir)/*/*.o-boot +CLEAN_FILES += $(odir)/*/*.$(way_)hi $(odir)/*/*.$(way_)hi-boot $(odir)/*/*.$(way_)o-boot ifeq "$(UsingHsBoot)" "YES" CLEAN_FILES += $(odir)/*/*.hi-boot $(odir)/*/*.o-boot @@ -181,15 +204,11 @@ endif # be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the # equivalent of `env' if it doesn't exist locally). # -ifneq "$(way)" "dll" ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" GHC_PROG=$(odir)/ghc$(_way)-$(ProjectVersion) else GHC_PROG=$(odir)/ghc$(_way) endif -else -GHC_PROG=$(odir)/ghc-$(ProjectVersion) -endif ifeq "$(stage)" "1" HS_PROG = $(GHC_PROG) @@ -207,6 +226,7 @@ boot :: $(CONFIG_HS) $(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) @@ -216,7 +236,10 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @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) @@ -248,6 +271,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) @@ -713,21 +737,23 @@ 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_PROG = $(odir)/ghc-inplace$(exeext) +INPLACE_SRC = $(odir)/ghc-inplace.c +INPLACE_PROG = $(odir)/ghc-inplace$(_way)$(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)) +CLEAN_FILES += $(INPLACE_SRC) -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=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $(INPLACE_EXTRA_FLAGS) $< -o $@ +$(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 $@ all :: $(INPLACE_PROG) @@ -798,7 +824,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 #----------------------------------------------------------------------------- @@ -821,9 +847,7 @@ PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)' PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"' # Omit Main from the library, the client will want to plug their own Main in -LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o \ - $(odir)/main/Main.p_o $(odir)/parser/hschooks.p_o, \ - $(OBJS)) +LIBOBJS = $(filter-out $(odir)/main/Main.$(way_)o $(odir)/parser/hschooks.$(way_)o, $(OBJS)) # disable splitting: it won't really help with GHC, and the specialised # build system for compiler/ isn't set up to handle it. @@ -841,7 +865,7 @@ GhcLibHcOpts = HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) # Haddock can't handle recursive modules currently, so we disable it for now. -HADDOCK_DOCS = NO +override HADDOCK_DOCS = NO # Tell package.mk not to set $(HC) NO_SET_HC = YES @@ -859,24 +883,6 @@ NO_SET_HC = YES # configuration. Yeuch... maybe one day this will all be done more cleanly. STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE) -ifeq "$(GhcBuildDylibs)" "YES" -ifeq "$(darwin_TARGET_OS)" "1" -GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.dylib -else -GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.so -endif -else -GhcLibraryName=libHS$(PACKAGE)$(_way).a -endif - -ifneq "$(DOING_BIN_DIST)" "YES" -$(GHC_PROG) : $(GhcLibraryName) main/Main.hs - $(RM) package.conf.inplace - $(RM) $(STAMP_PKG_CONF) - $(MAKE) $(STAMP_PKG_CONF) - $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@ -endif - # Propagate standard targets to Makefile.ghcbin docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html chm HxS ps dvi txt:: $(MAKE) -f Makefile.ghcbin $(MFLAGS) $@ @@ -910,12 +916,23 @@ TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs pa include $(TOP)/mk/target.mk ifeq "$(BUILD_GHC_PACKAGE)" "YES" -ifeq "$(way)" "" all :: $(GHC_PROG) endif + +$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ) + +ifneq "$(findstring $(stage), 2 3)" "" +$(warning LIBRARY is $(LIBRARY)) + +ifneq "$(DOING_BIN_DIST)" "YES" +$(GHC_PROG) : $(LIBRARY) main/Main.hs + $(RM) package.conf.inplace + $(RM) $(STAMP_PKG_CONF) + $(MAKE) way="" $(STAMP_PKG_CONF) + $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@ +endif endif -$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' #----------------------------------------------------------------------------- # binary-dist