X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=4db30aa9319ae73026f29592ceb6e6d8cc0f1384;hb=d363c1fc28d8227b27b4506ebeb089845c5b0af6;hp=6c83f9cd8c3a5652881c465efda5dda15cf0e107;hpb=27218ba74f28c527e0b3e88195169b6949d98899;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 6c83f9c..4db30aa 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -214,6 +214,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) + @echo "cStage = STAGE" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @@ -413,8 +414,6 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter, readline, and Template Haskell extensions SRC_HC_OPTS += -DGHCI -package template-haskell -# -DBREAKPOINT causes a loop in stage2 -# SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell PKG_DEPENDS += template-haskell # Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style @@ -423,8 +422,10 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE endif +ifneq "$(GhcNotThreaded)" "YES" # Use threaded RTS with GHCi, so threads don't get blocked at the prompt. SRC_HC_OPTS += -threaded +endif ALL_DIRS += ghci @@ -525,16 +526,6 @@ SRC_HC_OPTS += -package Cabal PKG_DEPENDS += Cabal endif -# We use Text.Regex which is in regex-compat with GHC 6.6+ -ifeq "$(bootstrapped)" "YES" -SRC_HC_OPTS += -package regex-compat -PKG_DEPENDS += regex-compat -else -ifeq "$(ghc_ge_605)" "YES" -SRC_HC_OPTS += -package regex-compat -endif -endif - ifeq "$(ghc_ge_603)" "YES" # Ignore lang, to avoid potential clash with the Generics module if # lang happens to be a dependency of some exposed package in the local @@ -726,6 +717,11 @@ all :: $(odir)/ghc-inplace ghc-inplace # (On other system, -W isn't a pwd flag at all.) ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +all :: $(odir)/ghc-inplace.bat ghc-inplace.bat +CLEAN_FILES += $(odir)/ghc-inplace.bat ghc-inplace.bat +endif + +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" # MSys (...and cygwin with a mingw toolchain) SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh else @@ -733,7 +729,7 @@ else SCRIPT_SHELL = /bin/sh endif -# Note 2 +# MSys Note 2 # On MSys, we must use the following script for ghc-inplace: # exec /c/darcs/fc-branch-2/compiler/stage1/ghc -Bc:/darcs/fc-branch-2 "$@" # That is, @@ -754,6 +750,19 @@ $(odir)/ghc-inplace : $(GHC_PROG) # Re exec, see note 2 above chmod 755 $@ +# MSys Note 3 +# When we generate a .bat file, we must also use the form +# @call c:\darcs\fc-branch-2\compiler\stage1\ghc-inplace +# else the cmd shell gets confused; indeed it seems to simply hang +# Hence the use of $(FPTOOLS_TOP_ABS_PLATFORM) here, just like MSys Note 2 + +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG) + @$(RM) $@ + echo '@call $(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@ + chmod 755 $@ +endif + ghc-inplace : stage1/ghc-inplace $(RM) -f $@ && $(LN_S) $< $@ @@ -876,17 +885,58 @@ all :: $(GHC_PROG) # configuration. Yeuch... maybe one day this will all be done more cleanly. STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE) -$(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs +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) $@ endif +include $(TOP)/mk/package.mk + +#----------------------------------------------------------------------------- +# binary-dist + +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) +endif + +binary-dist: + $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler + $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/stage$(stage) + echo "stage=$(stage)" > $(BIN_DIST_DIR)/compiler/Makefile + cat Makefile >> $(BIN_DIST_DIR)/compiler/Makefile + $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/compiler/ + set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done + set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done +ifneq "$(INSTALL_LIBS)" "" + set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done +endif +ifneq "$(INSTALL_PROGS)" "" + set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done +endif +ifneq "$(INSTALL_LIBEXECS)" "" + set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done +endif + #----------------------------------------------------------------------------- # clean @@ -912,9 +962,10 @@ EXTRA_SRCS += parser/Parser.y TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS))) - include $(TOP)/mk/target.mk +$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"' + # ----------------------------------------------------------------------------- # Explicit dependencies