summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-10-20 19:28:36 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-10-27 14:03:14 -0400
commitf76c5a083edc62bb40efbb0e76e8a3bf50ead765 (patch)
tree5f15dfcdac91d6698d9fa57d7ccb87b235576144 /ghc.mk
parent0b3d23afcad8bc14f2ba69b8dbe05c314e6e7b29 (diff)
downloadhaskell-f76c5a083edc62bb40efbb0e76e8a3bf50ead765.tar.gz
ghc.mk: amend 'make sdist'
Noticed 'make sdist' failure seen as: ``` "rm" -rf sdistprep/ghc/ghc-9.1.0.20201020/hadrian/_build/ (SRC_DIST_GHC_DIR)/hadrian/dist-newstyle/ /bin/sh: -c: line 0: syntax error near unexpected token `(' ``` commit 9657f6f34 ("sdist: Include hadrian sources in source distribution") added a new cleanup path without a variable expantion. The change adds variable reference. While at it move directory cleanup to a separate statement. Amends #18794 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index 692962d10d..61d314c624 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1215,7 +1215,8 @@ 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)/hadrian/_build/)
+ $(call removeTrees,$(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)