summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorAlec Theriault <alec.theriault@gmail.com>2019-02-13 07:44:58 -0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-02-16 09:16:32 -0500
commit3cb063c805ec841ca33b8371ef8aba9329221b6c (patch)
treecc036e6f732cf1f72454d2950a5b4ff4b6cdd70c /ghc.mk
parent7752fa54909a10b565a80a5ca8b751e174b14282 (diff)
downloadhaskell-3cb063c805ec841ca33b8371ef8aba9329221b6c.tar.gz
Remove `parallel` as a submodule
`parallel` is used in exactly one place in the GHC tree: the T2317 test. It seems almost by accident that it is a submodule; libraries needed only for tests should net be included as submodules (see `QuickCheck`, `async`, `haskell98`, `regex-compat`, `utf8-string`, `vector` and more for examples). T2317 will now get run only when `parallel` is installed instead of `parallel` being required for the testsuite to run.
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/ghc.mk b/ghc.mk
index 143afb9c9d..47d260db9f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1206,9 +1206,6 @@ GIT_COMMIT_ID:
sdist-ghc-prep-tree : VERSION GIT_COMMIT_ID
-# Extra packages which shouldn't be in the source distribution: see #8801
-EXTRA_PACKAGES=parallel
-
.PHONY: sdist-ghc-prep-tree
sdist-ghc-prep-tree :
$(call removeTrees,$(SRC_DIST_GHC_ROOT))
@@ -1223,7 +1220,6 @@ sdist-ghc-prep-tree :
$(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
cd $(SRC_DIST_GHC_DIR) && "$(FIND)" $(SRC_DIST_GHC_DIRS) \( -name .git -o -name "autom4te*" -o -name "*~" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | "$(XARGS)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS_REC)
# Add files generated by alex and happy.