Fix #8801: exclude extra packages from the sdist.
authorAustin Seipp <austin@well-typed.com>
Thu, 20 Feb 2014 07:17:57 +0000 (01:17 -0600)
committerAustin Seipp <austin@well-typed.com>
Thu, 20 Feb 2014 07:17:59 +0000 (01:17 -0600)
This is special cased a little since it's cleaner, and we don't
necessarily want to remove nofib anyway - just the extra packages.

Signed-off-by: Austin Seipp <austin@well-typed.com>
ghc.mk

diff --git a/ghc.mk b/ghc.mk
index cb0dcde..3bca571 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -1109,6 +1109,9 @@ define sdist_ghc_file
        mv $(SRC_DIST_GHC_DIR)/$1/$3/$4/$5.$6 $(SRC_DIST_GHC_DIR)/$1/$3/$4/$5.$6.source
 endef
 
+# Extra packages which shouldn't be in the source distribution: see #8801
+EXTRA_PACKAGES=parallel stm random primitive vector dph
+
 .PHONY: sdist-ghc-prep
 sdist-ghc-prep :
        $(call removeTrees,$(SRC_DIST_GHC_ROOT))
@@ -1123,6 +1126,7 @@ sdist-ghc-prep :
        $(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/stamp/)
        $(call removeTrees,$(SRC_DIST_GHC_DIR)/compiler/stage[123])
        $(call removeFiles,$(SRC_DIST_GHC_DIR)/mk/build.mk)
+       for i in $(EXTRA_PACKAGES); do $(RM) $(RM_OPTS_REC) $(SRC_DIST_GHC_DIR)/libraries/$$i/; done
        $(call sdist_ghc_file,compiler,stage2,cmm,,CmmLex,x)
        $(call sdist_ghc_file,compiler,stage2,cmm,,CmmParse,y)
        $(call sdist_ghc_file,compiler,stage2,parser,,Lexer,x)