X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=04c7778ba9e9dbeb097de2874fad52f96f1e0857;hp=342a1ab156c7552aeaaf994aeb1fe76fa8251dc4;hb=5123ae93cfc5cdfcecc84340a9517580ad900d64;hpb=3f070beb602a1b40d185ec49f7b556a7cc624d51 diff --git a/compiler/Makefile b/compiler/Makefile index 342a1ab..04c7778 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -21,6 +21,11 @@ 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" @@ -178,7 +183,7 @@ 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 @@ -199,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) @@ -270,7 +271,16 @@ 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) +ifeq "$(RelocatableBuild)" "YES" + @echo "cRelocatableBuild = True" >> $(CONFIG_HS) +else + @echo "cRelocatableBuild = False" >> $(CONFIG_HS) +endif +ifeq "$(UseLibFFI)" "YES" + @echo "cLibFFI = True" >> $(CONFIG_HS) +else + @echo "cLibFFI = False" >> $(CONFIG_HS) +endif @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -440,7 +450,7 @@ endif ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" -# Yes, include the interepreter, readline, and Template Haskell extensions +# Yes, include the interepreter and Template Haskell extensions SRC_HC_OPTS += -DGHCI -package template-haskell PKG_DEPENDS += template-haskell @@ -487,10 +497,7 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE PKG_DEPENDS += readline endif else --include $(FPTOOLS_TOP)/libraries/readline/config.mk -# readline's config.mk sets PACKAGE, which we don't want here -PACKAGE= -ifeq "$(READLINE_BUILD_PACKAGE)" "yes" +ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/readline/unbuildable)" "" SRC_HC_OPTS += -package readline -DUSE_READLINE PKG_DEPENDS += readline endif @@ -736,9 +743,12 @@ 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 +CLEAN_FILES += $(INPLACE_SRC) + GHC_PATH=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)$(exeext) ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" @@ -746,7 +756,8 @@ INPLACE_EXTRA_FLAGS = -optc-DWINDOWS endif $(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 $@ + $(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) @@ -836,13 +847,14 @@ PACKAGE = ghc HIERARCHICAL_LIB = NO VERSION = $(ProjectVersion) PKG_DEPENDS += base haskell98 -PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)' +LIB_LD_OPTS += $(foreach pkg,$(PKG_DEPENDS),-package $(pkg)) +# We have to expand each package dependency with its version, which we +# can do by calling "ghc-pkg list $pkg --simple-output". +PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))' 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. @@ -856,8 +868,14 @@ GhcLibWays = $(GhcCompilerWays) # override $(GhcLibHcOpts): we want GhcStage2HcOpts to take precedence GhcLibHcOpts = +ifeq "$(DOING_BIN_DIST)" "YES" +# This is derived from the sources when we are in a source tree, but we +# don't have any sources in a bindist, so we have to shortcut it +HS_IFACES := $(wildcard stage$(stage)/*/*.hi) +else # override default definition of HS_IFACES so we can add $(odir) HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) +endif # Haddock can't handle recursive modules currently, so we disable it for now. override HADDOCK_DOCS = NO @@ -878,24 +896,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) $@ @@ -926,24 +926,58 @@ EXTRA_SRCS += parser/Parser.y TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) +WRONG_GHCTAGS_HS_SRCS = $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) +# above is wrong because of the following problem: +# module `main:DataCon' is defined in multiple files: basicTypes/DataCon.lhs +# basicTypes/DataCon.lhs-boot + +GHCTAGS_HS_SRCS = $(HS_SRCS) +GHCTAGS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS)) +GHCTAGS_HC_OPTS += -DSTAGE='"$(stage)"' + +#------------------------------------------------------------ +# Tags + +.PHONY: ghctags + +ghctags :: $(GHCTAGS_HS_SRCS) $(TAGS_C_SRCS) + @if [ "$(stage)" != 2 ]; then echo "Must use 'make stage=2 ghctags'"; exit 1; fi + @$(RM) TAGS + @touch TAGS + @echo SOURCES ARE "$(GHCTAGS_HS_SRCS)" + : ifneq "$(GHCTAGS_HS_SRCS)" "" + @echo TIME TO ROCK AND ROLL + # $(GHCTAGS_INPLACE) -- $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) -- $(GHCTAGS_HS_SRCS) + $(GHCTAGS_INPLACE) -- $(GHCTAGS_HC_OPTS) -- $(GHCTAGS_HS_SRCS) + : endif +ifneq "$(TAGS_C_SRCS)" "" + etags -a $(TAGS_C_SRCS) +endif + @( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree? + include $(TOP)/mk/target.mk ifeq "$(BUILD_GHC_PACKAGE)" "YES" -ifeq "$(way)" "" all :: $(GHC_PROG) endif -endif $(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ) -#----------------------------------------------------------------------------- -# binary-dist +ifneq "$(findstring $(stage), 2 3)" "" +$(warning LIBRARY is $(LIBRARY)) -ifeq "$(DOING_BIN_DIST)" "YES" -# This is derived from the sources when we are in a source tree, but we -# don't have any sources in a bindist, so we have to shortcut it -HS_IFACES := $(wildcard stage$(stage)/*/*.hi) +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 + + +#----------------------------------------------------------------------------- +# binary-dist binary-dist: $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler