summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-10-05 16:23:50 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-10-09 08:48:52 -0400
commit9657f6f34a1a00008a0db935dbf25733cb483cd4 (patch)
tree65c9252d317a335cc5be43e5eb536ad17e8e86eb /ghc.mk
parent32dc7698a0c38afe2889119a2df0f2a2b8debe0a (diff)
downloadhaskell-9657f6f34a1a00008a0db935dbf25733cb483cd4.tar.gz
sdist: Include hadrian sources in source distribution
Previously the make build system's source distribution rules neglected to include Hadrian's sources. Fixes #18794.
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index ec4115973a..7546c21f20 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1173,7 +1173,8 @@ SRC_DIST_TESTSUITE_TARBALL = $(SRC_DIST_ROOT)/$(SRC_DIST_TESTSUITE_NAME).
# Files to include in source distributions
#
SRC_DIST_GHC_DIRS = mk rules docs distrib bindisttest libffi includes \
- utils docs rts compiler ghc driver libraries libffi-tarballs
+ utils docs rts compiler ghc driver libraries libffi-tarballs \
+ hadrian
SRC_DIST_GHC_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README.md ANNOUNCE HACKING.md INSTALL.md LICENSE Makefile \
@@ -1214,6 +1215,7 @@ sdist-ghc-prep-tree :
cd $(SRC_DIST_GHC_DIR) && $(MAKE) distclean
$(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/tarballs/)
$(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/stamp/)
+ $(call removeTrees,$(SRC_DIST_GHC_DIR)/hadrian/_build/ (SRC_DIST_GHC_DIR)/hadrian/dist-newstyle/)
$(call removeTrees,$(SRC_DIST_GHC_DIR)/compiler/stage[123])
$(call removeFiles,$(SRC_DIST_GHC_DIR)/mk/build.mk)
$(call removeFiles,$(SRC_DIST_GHC_DIR)/rts/rts.cabal)