done
else
for i in */*hi-boot*; do \
- $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \
+ ($(RM) -f stage$(stage)/$$i \
+ && $(LN_S) ../../$$i stage$(stage)/$$i) || true ; \
done
endif
endif
#
ifneq "$(way)" "dll"
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-HS_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
+GHC_PROG=$(odir)/ghc$(_way)-$(ProjectVersion)
else
-HS_PROG=$(odir)/ghc$(_way)
+GHC_PROG=$(odir)/ghc$(_way)
endif
else
-HS_PROG=$(odir)/ghc-$(ProjectVersion)
+GHC_PROG=$(odir)/ghc-$(ProjectVersion)
+endif
+
+ifneq "$(stage)" "2"
+HS_PROG = $(GHC_PROG)
endif
# -----------------------------------------------------------------------------
ifneq "$(findstring $(stage), 2 3)" ""
bootstrapped = YES
else
-bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
+bootstrapped = NO
endif
endif
# 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
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
PKG_DEPENDS += readline
endif
else
-ifeq "$(GhcLibsWithReadline)" "YES"
+-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"
SRC_HC_OPTS += -package readline -DUSE_READLINE
PKG_DEPENDS += readline
endif
SRC_HC_OPTS += \
-cpp -fglasgow-exts -fno-generics -Rghc-timing \
- -I. -IcodeGen -InativeGen -Iparser
+ -I. -Iparser
# Omitted: -I$(GHC_INCLUDE_DIR)
# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,
SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
# We need System.Posix (or Posix when ghc < 6.2)
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package Win32
+PKG_DEPENDS += Win32
+endif
+else
ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO"
SRC_HC_OPTS += -package posix
else
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
basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields
-ifeq "$(bootstrapped)" "YES"
-utils/Binary_HC_OPTS = -funbox-strict-fields
-endif
-
# We always optimise some low-level modules, otherwise performance of
# a non-optimised compiler is severely affected.
main/BinIface_HC_OPTS += -O
-utils/Binary_HC_OPTS += -O
+utils/Binary_HC_OPTS += -O -funbox-strict-fields
utils/FastMutInt_HC_OPTS += -O
utils/Encoding_HC_OPTS += -O
-utils/StringBuffer_HC_OPTS += -O
-utils/FastString_HC_OPTS += -O
+utils/StringBuffer_HC_OPTS += -O -funbox-strict-fields
+utils/FastString_HC_OPTS += -O -funbox-strict-fields
# ---- Profiling ----
#simplCore/Simplify_HC_OPTS = -auto-all
# ghc_strlen percolates through so many modules that it is easier to get its
# prototype via a global option instead of a myriad of per-file OPTIONS
-SRC_HC_OPTS += '-\#include "hschooks.h"'
+SRC_HC_OPTS += '-\#include "cutils.h"'
# ----------------------------------------------------------------------------
# Generate supporting stuff for prelude/PrimOp.lhs
depend :: $(PRIMOP_BITS)
endif
+# This is an ugly hack: we need stage1/$(PLATFORM_H) built before we
+# preprocess primops.txt.pp, but we don't want to just add that
+# dependency because we don't want $(PLATFORM_H) built during normal
+# operations, because we don't have have dependencies from the .hs
+# sources on it, and we don't want those dependencies because that
+# would cause everything to be rebuilt every time the Makefile
+# changed. So here we add the required dependency only when making
+# boot or depend:
+ifneq "$(findstring boot, $(MAKECMDGOALS))$(findstring depend, $(MAKECMDGOALS))" ""
+prelude/primops.txt.pp : stage1/$(PLATFORM_H)
+endif
+
primop-data-decl.hs-incl: prelude/primops.txt
$(GENPRIMOP) --data-decl < $< > $@
primop-tag.hs-incl: prelude/primops.txt
all :: $(odir)/ghc-inplace ghc-inplace
-$(odir)/ghc-inplace : $(HS_PROG)
+# 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.)
+
+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
+# 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 '#!/bin/sh' >>$@
- echo exec $(GHC_COMPILER_DIR_ABS)/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@
+ 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 $@
ghc-inplace : stage1/ghc-inplace
- $(LN_S) -f $< $@
+ $(RM) -f $@ && $(LN_S) $< $@
ifeq "$(stage)" "1"
CLEAN_FILES += ghc-inplace
DESTDIR = $(INSTALL_LIBRARY_DIR_GHC)
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALL_LIBEXECS += $(HS_PROG)
+INSTALL_LIBEXECS += $(GHC_PROG)
else
-INSTALL_PROGS += $(HS_PROG)
+INSTALL_PROGS += $(GHC_PROG)
endif
# ----------------------------------------------------------------------------
# package build system framework more or less does the right thing for
# us here.
+# All this section is stage-2 only!
ifeq "$(stage)" "2"
+
PACKAGE = ghc
HIERARCHICAL_LIB = NO
VERSION = $(ProjectVersion)
# Haddock can't handle recursive modules currently, so we disable it for now.
NO_HADDOCK_DOCS = 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.
+#
+# This is done by compiling Main.hs separately and linking it with
+# -package ghc. This is done using a separate Makefile, Makefile.ghcbin
+# Why? See comments in Makefile.ghcbin
+
+all :: $(GHC_PROG)
+
+$(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs
+ $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@
+
+# 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/target.mk
# -----------------------------------------------------------------------------
+# Explicit dependencies
+
+# Some .hs files #include other source files, but since ghc -M doesn't spit out
+# these dependencies we have to include them manually.
+
+# We don't add dependencies on HsVersions.h, ghcautoconf.h, or ghc_boot_platform.h,
+# because then modifying one of these files would force recompilation of everything,
+# which is probably not what you want. However, it does mean you have to be
+# careful to recompile stuff you need if you reconfigure or change HsVersions.h.
+
+# Aargh, these don't work properly anyway, because GHC's recompilation checker
+# just reports "compilation NOT required". Do we have to add -no-recomp for each
+# of these .hs files? I haven't done anything about this yet.
+
+$(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h
+$(odir)/codeGen/CgCallConv.$(way_)o : ../includes/StgFun.h
+$(odir)/codeGen/CgProf.$(way_)o : ../includes/MachDeps.h
+$(odir)/codeGen/CgProf.$(way_)o : ../includes/Constants.h
+$(odir)/codeGen/CgProf.$(way_)o : ../includes/DerivedConstants.h
+$(odir)/codeGen/CgTicky.$(way_)o : ../includes/DerivedConstants.h
+$(odir)/codeGen/ClosureInfo.$(way_)o : ../includes/MachDeps.h
+$(odir)/codeGen/SMRep.$(way_)o : ../includes/MachDeps.h
+$(odir)/codeGen/SMRep.$(way_)o : ../includes/ClosureTypes.h
+$(odir)/ghci/ByteCodeAsm.$(way_)o : ../includes/Bytecodes.h
+$(odir)/ghci/ByteCodeFFI.$(way_)o : nativeGen/NCG.h
+$(odir)/ghci/ByteCodeInstr.$(way_)o : ../includes/MachDeps.h
+$(odir)/ghci/ByteCodeItbls.$(way_)o : ../includes/ClosureTypes.h
+$(odir)/ghci/ByteCodeItbls.$(way_)o : nativeGen/NCG.h
+$(odir)/main/Constants.$(way_)o : ../includes/MachRegs.h
+$(odir)/main/Constants.$(way_)o : ../includes/Constants.h
+$(odir)/main/Constants.$(way_)o : ../includes/MachDeps.h
+$(odir)/main/Constants.$(way_)o : ../includes/DerivedConstants.h
+$(odir)/main/Constants.$(way_)o : ../includes/GHCConstants.h
+$(odir)/nativeGen/AsmCodeGen.$(way_)o : nativeGen/NCG.h
+$(odir)/nativeGen/MachCodeGen.$(way_)o : nativeGen/NCG.h
+$(odir)/nativeGen/MachCodeGen.$(way_)o : ../includes/MachDeps.h
+$(odir)/nativeGen/MachInstrs.$(way_)o : nativeGen/NCG.h
+$(odir)/nativeGen/MachRegs.$(way_)o : nativeGen/NCG.h
+$(odir)/nativeGen/MachRegs.$(way_)o : ../includes/MachRegs.h
+$(odir)/nativeGen/PositionIndependentCode.$(way_)o : nativeGen/NCG.h
+$(odir)/nativeGen/PprMach.$(way_)o : nativeGen/NCG.h
+$(odir)/nativeGen/RegAllocInfo.$(way_)o : nativeGen/NCG.h
+$(odir)/typecheck/TcForeign.$(way_)o : nativeGen/NCG.h
+$(odir)/utils/Binary.$(way_)o : ../includes/MachDeps.h
+$(odir)/utils/FastMutInt.$(way_)o : ../includes/MachDeps.h
+
+# -----------------------------------------------------------------------------
# Dependencies
MKDEPENDHS_HC_OPTS = $(patsubst -i$(odir)/%, -i%, $(HC_OPTS))
$(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
endif
$(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS)
- $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g; s@^.*/lib/compat.*$$@@g;' <.depend-BASE >.depend-$(stage)
+ $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g; s@^.*/compat.*$$@@g;' <.depend-BASE >.depend-$(stage)
# The binmode stuff tells perl not to add stupid ^M's to the output
#
# The /lib/compat replacement is to workaround a bug in the
projects / ghc-hetmet.git / blobdiff