Make compileToCore return the module name and type environment along with bindings

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 287754a..c079170 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -302,7 +302,9 @@ binary-dist::
        $(MAKE) -C gmp       binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C includes  binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C compiler  binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
-       $(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES
+       # Setting _way here is a nasty hack to make sure we get
+       # libHSrts*.a etc rather than just libHSrts.a
+       $(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES _way='*'
        $(MAKE) -C driver    binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C utils     binary-dist DOING_BIN_DIST=YES
        $(MAKE) -C docs      binary-dist DOING_BIN_DIST=YES
@@ -328,6 +330,9 @@ binary-dist::
        echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
        echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
        echo "XMLDocWays = $(XMLDocWays)"                            >> $(VARFILE)
+       echo "TARGETPLATFORM = $(TARGETPLATFORM)"                    >> $(VARFILE)
+       echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"                        >> $(VARFILE)
+
        cat distrib/Makefile-bin-vars.in                             >> $(VARFILE)
        @echo "Generating a shippable configure script.."
        $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac