use the correct $(HC)

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index 653f4d1..f4ab45b 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -346,6 +346,10 @@ endif
        @echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@
        @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
        @echo >> $@
+ifeq "$(GhcWithTablesNextToCode)" "YES"
+       @echo "#define TABLES_NEXT_TO_CODE 1" >> $@
+endif
+       @echo >> $@
        @echo "#endif /* __PLATFORM_H__ */"          >> $@
        @echo "Done."
 
@@ -411,7 +415,9 @@ endif
 ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
-SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
+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.
@@ -717,8 +723,8 @@ 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
+#      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
@@ -820,7 +826,9 @@ coreSyn/CorePrep_HC_OPTS += -auto-all
 # 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)
@@ -848,16 +856,19 @@ 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
 
-# Don't build the GHC binary as normal, because we need to link it
-# against the GHC package.  The GHC binary itself is built by
-# compiling Main.o separately and linking it with -package ghc.  This is
-# done using a separate Makefile:
+# 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