X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=19fba4e1cc14121d685b32e7bb043b8247e903a3;hb=923ee9d360ed15331ac6faf8a6b4aca334fc0cee;hp=c2cf2257ebaa4bcaaa086a23770b059d442b6a23;hpb=6e8a4b336eeb90d130d83758d24db7e11bbecdfc;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index c2cf225..19fba4e 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -192,7 +192,7 @@ else GHC_PROG=$(odir)/ghc-$(ProjectVersion) endif -ifneq "$(stage)" "2" +ifeq "$(stage)" "1" HS_PROG = $(GHC_PROG) endif @@ -217,6 +217,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) + @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS) @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) @@ -412,12 +413,18 @@ 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 +# or not? +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 @@ -518,16 +525,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 @@ -719,14 +716,19 @@ all :: $(odir)/ghc-inplace ghc-inplace # (On other system, -W isn't a pwd flag at all.) ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -# MSys -SCRIPT_SHELL = $(shell cd /bin; pwd -W)/sh +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 # Cygwin and Unix 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, @@ -747,6 +749,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) $< $@ @@ -818,18 +833,17 @@ coreSyn/CorePrep_HC_OPTS += -auto-all #----------------------------------------------------------------------------- # Building the GHC package -# The GHC package is made from the stage 2 build. Fortunately the -# package build system framework more or less does the right thing for -# us here. - -# All this section is stage-2 only! -ifeq "$(stage)" "2" +# The GHC package is made from the stage 2 build and later. +# Fortunately the package build system framework more or less does the +# right thing for us here. +ifneq "$(findstring $(stage), 2 3)" "" PACKAGE = ghc HIERARCHICAL_LIB = NO VERSION = $(ProjectVersion) PKG_DEPENDS += base haskell98 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, $(OBJS)) @@ -852,6 +866,9 @@ HS_IFACES = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS))) # Haddock can't handle recursive modules currently, so we disable it for now. NO_HADDOCK_DOCS = YES +# Tell package.mk not to set $(HC) +NO_SET_HC = YES + # The stage 2 GHC binary itself is built by compiling main/Main.hs # (the same as used in stage 1) against the GHC package. # @@ -861,7 +878,26 @@ NO_HADDOCK_DOCS = YES all :: $(GHC_PROG) -$(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs +# The stage 2 and stage 3 package.conf.in files are different, because they +# point to either the stage2/ or stage3/ dirs in import-dirs. Hence before +# linking the ghc binary we must install the correct version of the package +# 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 + +$(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) $@ # Propagate standard targets to Makefile.ghcbin