# 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
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
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
# (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
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,
# 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) $< $@
# 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.
#
# 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
+
+# $(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
TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
-
include $(TOP)/mk/target.mk
# -----------------------------------------------------------------------------