[commit: ghc] ghc-7.8: Fix #8801: exclude extra packages from the sdist. (cd10cd4)

git at git.haskell.org git at git.haskell.org
Thu Feb 20 12:01:20 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/cd10cd4b6509a827fb3278d51d2802dfedd24ddc/ghc

>---------------------------------------------------------------

commit cd10cd4b6509a827fb3278d51d2802dfedd24ddc
Author: Austin Seipp <austin at well-typed.com>
Date:   Thu Feb 20 01:17:57 2014 -0600

    Fix #8801: exclude extra packages from the sdist.
    
    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 at well-typed.com>
    
    (cherry picked from commit f99a0321a8cf0507924a0d30b6b7b586d7855129)


>---------------------------------------------------------------

cd10cd4b6509a827fb3278d51d2802dfedd24ddc
 ghc.mk |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ghc.mk b/ghc.mk
index 4bd47c6..8b7b031 100644
--- 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)



More information about the ghc-commits mailing list