X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=42e2ad6cfc973c5e274222bd442afb97c7689eda;hp=df51855f8c23f13c2f3ff745e6825c491d58fa13;hb=75d172aa49ec59699f52837eb4c6ea8abc27a03e;hpb=b6eec100fcbed77d210d19f46d09ebc4e01059c8

diff --git a/ghc.mk b/ghc.mk
index df51855..42e2ad6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -299,7 +299,7 @@ DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
 # Packages that, if present, must be built by the stage2 compiler,
 # because they use TH and/or annotations, or depend on other stage2
 # packages:
-STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010
+STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 random
 # Packages that we shouldn't build if we don't have TH (e.g. because
 # we're building a profiled compiler):
 TH_PACKAGES := $(DPH_PACKAGES)
@@ -808,8 +808,7 @@ endif # Windows
 
 ifneq "$(BINDIST)" "YES"
 $(ghc-prim-$(libraries/ghc-prim_dist-install_VERSION)_HADDOCK_FILE): \
-    libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs \
-    libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs
+    libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs
 endif # BINDIST
 
 libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \
@@ -817,11 +816,6 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \
                           | $$(dir $$@)/.
 	"$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@
 
-libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
-                            $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \
-                          | $$(dir $$@)/.
-	"$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@
-
 .PHONY: tags
 tags: tags_compiler
 
@@ -992,16 +986,16 @@ $(eval $(call bindist,.,\
     $(INPLACE_BIN)/mkdirhier \
     $(INPLACE_BIN)/ghc-cabal \
     utils/ghc-pwd/ghc-pwd \
-	$(BINDIST_WRAPPERS) \
-	$(BINDIST_PERL_SOURCES) \
-	$(BINDIST_LIBS) \
-	$(BINDIST_HI) \
-	$(BINDIST_EXTRAS) \
-	$(includes_H_CONFIG) \
-	$(includes_H_PLATFORM) \
+    $(BINDIST_WRAPPERS) \
+    $(BINDIST_PERL_SOURCES) \
+    $(BINDIST_LIBS) \
+    $(BINDIST_HI) \
+    $(BINDIST_EXTRAS) \
+    $(includes_H_CONFIG) \
+    $(includes_H_PLATFORM) \
     $(includes_H_FILES) \
-	includes/ghcconfig.h \
-	includes/rts/Config.h \
+    includes/ghcconfig.h \
+    includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -1011,21 +1005,21 @@ $(eval $(call bindist,.,\
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
-	docs/index.html \
-	compiler/stage2/doc \
-	$(wildcard libraries/*/dist-install/doc/) \
-	$(wildcard libraries/*/*/dist-install/doc/) \
+    docs/index.html \
+    compiler/stage2/doc \
+    $(wildcard libraries/*/dist-install/doc/) \
+    $(wildcard libraries/*/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \
-	mk/project.mk \
-	mk/install.mk.in \
-	bindist.mk \
-	libraries/gen_contents_index \
-	libraries/prologue.txt \
-	libraries/dph/LICENSE \
-	libraries/dph/ghc-packages \
-	libraries/dph/ghc-packages2 \
-	libraries/dph/ghc-stage2-package \
+    mk/project.mk \
+    mk/install.mk.in \
+    bindist.mk \
+    libraries/gen_contents_index \
+    libraries/prologue.txt \
+    $(wildcard libraries/dph/LICENSE \
+               libraries/dph/ghc-packages \
+               libraries/dph/ghc-packages2 \
+               libraries/dph/ghc-stage2-package) \
  ))
 endif
 # mk/project.mk gets an absolute path, so we manually include it in
@@ -1082,9 +1076,15 @@ ifeq "$(mingw32_TARGET_OS)" "1"
 	$(call try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist)
 endif
 
+ifeq "$(mingw32_TARGET_OS)" "1"
+DOCDIR_TO_PUBLISH = bindisttest/"install dir"/doc
+else
+DOCDIR_TO_PUBLISH = bindisttest/"install dir"/share/doc/ghc
+endif
+
 .PHONY: publish-docs
 publish-docs:
-	$(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs)
+	$(call try10Times,$(PublishCp) -r $(DOCDIR_TO_PUBLISH)/* $(PublishLocation)/docs)
 
 # -----------------------------------------------------------------------------
 # Source distributions