@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)
ALL_DIRS = \
utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
- specialise simplCore stranal stgSyn simplStg codeGen main \
+ vectorise specialise simplCore stranal stgSyn simplStg codeGen main \
profiling parser cprAnalysis ndpFlatten iface cmm
# Make sure we include Config.hs even if it doesn't exist yet...
# -----------------------------------------------------------------------------
# Building a compiler with interpreter support
#
-# The interpreter, GHCi interface, and Template Haskell are only
+# The interpreter, GHCi interface, Template Haskell and Hpc are only
# enabled when we are bootstrapping with the same version of GHC, and
# the interpreter is supported on this platform.
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
# Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -package template-haskell
-PKG_DEPENDS += template-haskell
+SRC_HC_OPTS += -DGHCI -package template-haskell -package hpc
+PKG_DEPENDS += template-haskell hpc
# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
# or not?
# -----------------------------------------------------------------------------
# create ghc-inplace, a convenient way to run ghc from the build tree...
+# See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use
+# a real binary here rather than a shell script.
-all :: $(odir)/ghc-inplace ghc-inplace
-
-# MSys notes
-# Note 1
-# I'm exec'ing $(SCRIPT_SHELL), rather than the usual #!/bin/sh, to make
-# sure that the right shell is invoked. If we use /bin/sh, then
-# when ghc-inplace is invoked from a Cygwin Python (which is the only Python
-# that seems to run the test-suite correctly), we get the Cygwin shell,
-# and it in turn interprets the path-names in the second (exec) line
-# differently to the MSys shell. That's bad, because ghc-inplace must
-# also work when invoked from MSys shells
-#
-# To figure out what the MSys shell is, we cd to '/bin' and do 'pwd -W'
-# On MSys, the -W flag prints out the directory in c:/msys/bin format
-# (On other system, -W isn't a pwd flag at all.)
+INPLACE_HS = $(odir)/ghc-inplace.hs
+INPLACE_PROG = $(odir)/ghc-inplace$(exeext)
+EXCLUDED_SRCS += $(INPLACE_HS)
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-all :: $(odir)/ghc-inplace.bat ghc-inplace.bat
-CLEAN_FILES += $(odir)/ghc-inplace.bat ghc-inplace.bat
-endif
+# 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))
-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
+ifeq "$(stage)" "1"
+EnvImport = System.Environment
+GetArgs = getArgs
else
-# Cygwin and Unix
-SCRIPT_SHELL = /bin/sh
+EnvImport = GHC.Environment
+GetArgs = getFullArgs
endif
-# 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,
-# (a) You *must* use the /c/ form for the first arg to exec. Using the
-# c:/ form makes exec complain that it can't find $pwd/c:/darcs/.../ghc
-# The /c/ form is $(FPTOOLS_TOP_ABS)
-# (b) You *must* use the c:/ form for the -B argument, else the testsuite
-# doesn't work. I think that's something to do with ghc-inplace being
-# invoked by Python
-# The c:/ form is $(FPTOOLS_TOP_ABS_PLATFORM)
-
-$(odir)/ghc-inplace : $(GHC_PROG)
- @$(RM) $@
- echo '#!$(SCRIPT_SHELL)' >>$@
-# Re SCRIPT_SHELL, see note 1 above
- echo exec $(GHC_COMPILER_DIR_ABS)/$(GHC_PROG) \
- '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
-# 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
+$(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)\":args) >>= exitWith" >> $@
-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
+$(INPLACE_PROG): $(INPLACE_HS)
+ $(HC) --make $< -o $@
-ghc-inplace : stage1/ghc-inplace
- $(RM) -f $@ && $(LN_S) $< $@
+all :: $(INPLACE_PROG)
+
+CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG)
ifeq "$(stage)" "1"
+ghc-inplace : $(INPLACE_PROG)
+ $(RM) -f $@ && $(LN_S) $< $@
+
+all :: ghc-inplace
+
CLEAN_FILES += ghc-inplace
endif
-CLEAN_FILES += $(odir)/ghc-inplace
-
#-----------------------------------------------------------------------------
# install
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
+HADDOCK_DOCS = NO
# Tell package.mk not to set $(HC)
NO_SET_HC = YES
$(MAKE) -f Makefile.ghcbin $(MFLAGS) $@
endif
-include $(TOP)/mk/package.mk
-
-#-----------------------------------------------------------------------------
-# binary-dist
-
-# $(error Q$(INSTALL_PROGS)W)
-foo:
- echo Q$(INSTALL_PROGS)W$(GHC_PROG)E
- echo Q$(INSTALL_LIBEXECS)W$(GHC_PROG)E
-
-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/
-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
include $(TOP)/mk/target.mk
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
+
+#-----------------------------------------------------------------------------
+# 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
+
# -----------------------------------------------------------------------------
# Explicit dependencies
projects / ghc-hetmet.git / blobdiff