vectoriser: fix warning
[ghc-hetmet.git] / ghc.mk
diff --git a/ghc.mk b/ghc.mk
index 4850720..1fd8509 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -292,12 +292,17 @@ include rules/bindist.mk
 # Packages that are built but not installed
 INTREE_ONLY_PACKAGES := haskeline mtl terminfo utf8-string xhtml
 
+DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \
+                dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
+                vector primitive
+
 # 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/dph-base dph/dph-prim-interface dph/dph-prim-seq \
-                  dph/dph-common dph/dph-prim-par dph/dph-par dph/dph-seq \
-                  vector primitive haskell98 haskell2010
+# packages:
+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)
 
 # Packages that are built by stage0, in addition to stage1.  These
 # packages are dependencies of GHC, that we do not assume the stage0
@@ -348,11 +353,13 @@ define addPackageGeneral
 endef
 
 define addPackage # args: $1 = package, $2 = condition
+ifneq "$(filter $1,$(TH_PACKAGES)) $(GhcProfiled)" "$1 YES"
 ifeq "$(filter $1,$(STAGE2_PACKAGES))" "$1"
 $(call addPackageGeneral,PACKAGES_STAGE2,$1,$2)
 else
 $(call addPackageGeneral,PACKAGES,$1,$2)
 endif
+endif
 endef
 
 $(eval $(call addPackage,ghc-prim))
@@ -428,6 +435,7 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk
 # package-data.mk is sufficient, as that in turn depends on all the
 # libraries
 utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk
+utils/ghc-pwd/dist/package-data.mk: compiler/stage2/package-data.mk
 
 utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk
 utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
@@ -451,9 +459,6 @@ ifeq "$(BuildSharedLibs)" "YES"
 ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB))
 endif
 BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
-# A useful pseudo-target
-.PHONY: stage1_libs
-stage1_libs : $(ALL_STAGE1_LIBS)
 
 OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
 ifeq "$(BuildSharedLibs)" "YES"
@@ -594,10 +599,6 @@ BUILD_DIRS += \
    $(GHC_GENAPPLY_DIR)
 endif
 
-BUILD_DIRS += \
-   utils/haddock \
-   utils/haddock/doc
-
 ifneq "$(CLEANING)" "YES"
 BUILD_DIRS += \
    $(patsubst %, libraries/%, $(PACKAGES))
@@ -608,11 +609,14 @@ BUILD_DIRS += libraries/integer-gmp/gmp
 endif
 
 BUILD_DIRS += \
+   utils/haddock \
+   utils/haddock/doc \
    compiler \
    $(GHC_HSC2HS_DIR) \
    $(GHC_PKG_DIR) \
    utils/testremove \
    utils/ghctags \
+   utils/ghc-pwd \
    utils/hpc \
    utils/runghc \
    ghc
@@ -660,6 +664,7 @@ utils/ghctags_dist_DISABLE = YES
 utils/hpc_dist_DISABLE = YES
 utils/hsc2hs_dist-install_DISABLE = YES
 utils/ghc-pkg_dist-install_DISABLE = YES
+utils/ghc-pwd_dist_DISABLE = YES
 utils/mkUserGuidePart_dist_DISABLE = YES
 utils/compare_sizes_dist_DISABLE = YES
 compiler_stage2_DISABLE = YES
@@ -672,6 +677,11 @@ endif
 
 include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 
+# A useful pseudo-target (must be after the include above, because it needs
+# the value of things like $(libraries/base_dist-install_v_LIB).
+.PHONY: stage1_libs
+stage1_libs : $(ALL_STAGE1_LIBS)
+
 # ----------------------------------------------
 # Per-package compiler flags
 # 
@@ -799,8 +809,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: \
@@ -808,11 +817,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
 
@@ -982,17 +986,17 @@ $(eval $(call bindist,.,\
     mk/config.mk.in \
     $(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) \
+    utils/ghc-pwd/dist/build/tmp/ghc-pwd \
+    $(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) \
@@ -1002,21 +1006,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
@@ -1073,9 +1077,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
@@ -1100,7 +1110,7 @@ publish-docs:
 # Directory in which we're going to build the src dist
 #
 SRC_DIST_NAME=ghc-$(ProjectVersion)
-SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
+SRC_DIST_DIR=$(TOP)/$(SRC_DIST_NAME)
 
 #
 # Files to include in source distributions
@@ -1190,10 +1200,6 @@ sdist_%:
 
 .PHONY: clean
 
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
-CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
 CLEAN_FILES += libraries/bootstrapping.conf
 CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
 CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants
@@ -1247,6 +1253,7 @@ distclean : clean
        "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h
        "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h
        "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h
+       "$(RM)" $(RM_OPTS_REC) utils/ghc-pwd/dist
 
        "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2))
        "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2))