diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-10-01 16:02:54 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-03 12:17:32 -0400 |
| commit | 259f4dffaf6698ab6923487e6aa0394d387ae8c6 (patch) | |
| tree | 782fc106b8f0cd3846e8dc32f6a0bc800bf6294e | |
| parent | cb364bc25592260a157c9d977619c42f3b2772a4 (diff) | |
| download | haskell-259f4dffaf6698ab6923487e6aa0394d387ae8c6.tar.gz | |
Exclude rts.cabal from source distributions
This modifies both the Hadrian and make build systems to avoid included
the rts.cabal generated by autoconf in the source distribution.
Fixes #17265.
| -rw-r--r-- | ghc.mk | 1 | ||||
| -rw-r--r-- | hadrian/src/Rules/SourceDist.hs | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -1204,6 +1204,7 @@ 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) + $(call removeFiles,$(SRC_DIST_GHC_DIR)/rts/rts.cabal) 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. diff --git a/hadrian/src/Rules/SourceDist.hs b/hadrian/src/Rules/SourceDist.hs index 8da98ef821..8eb215d9ea 100644 --- a/hadrian/src/Rules/SourceDist.hs +++ b/hadrian/src/Rules/SourceDist.hs @@ -93,6 +93,7 @@ prepareTree dest = do , Test "libraries/primitive" , Test "libraries/random" , Test "libraries/vector" + , Test "rts/rts.cabal" , Test "mk/build.mk" ] srcDirs = [ "bindisttest" |