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
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,
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
-utils/Binary_HC_OPTS = -funbox-strict-fields
-
# 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
chmod 755 $@
ghc-inplace : stage1/ghc-inplace
- $(LN_S) -f $< $@
+ $(RM) -f $@ && $(LN_S) $< $@
ifeq "$(stage)" "1"
CLEAN_FILES += ghc-inplace
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))