[commit: ghc] ghc-7.10: always use 'mkdir -p' and fix missing dir (fixes #9876) (8869388)
git at git.haskell.org
git at git.haskell.org
Tue Dec 23 15:14:50 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-7.10
Link : http://ghc.haskell.org/trac/ghc/changeset/886938892b8c69b66b7fd9001355117675537c26/ghc
>---------------------------------------------------------------
commit 886938892b8c69b66b7fd9001355117675537c26
Author: Joe Hillenbrand <joehillen at gmail.com>
Date: Tue Dec 23 09:15:20 2014 -0600
always use 'mkdir -p' and fix missing dir (fixes #9876)
Summary: Signed-off-by: Joe Hillenbrand <joehillen at gmail.com>
Reviewers: thomie, austin
Reviewed By: thomie, austin
Subscribers: carter, thomie
Differential Revision: https://phabricator.haskell.org/D566
GHC Trac Issues: #9876
(cherry picked from commit 9fc3aebd0920561d9d3c747e6b78591d332bed08)
>---------------------------------------------------------------
886938892b8c69b66b7fd9001355117675537c26
ghc.mk | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/ghc.mk b/ghc.mk
index 2c9c635..6c587bd 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1150,10 +1150,10 @@ EXTRA_PACKAGES=parallel stm random primitive vector dph
sdist-ghc-prep :
$(call removeTrees,$(SRC_DIST_GHC_ROOT))
$(call removeFiles,$(SRC_DIST_GHC_TARBALL))
- -mkdir $(SRC_DIST_ROOT)
- mkdir $(SRC_DIST_GHC_ROOT)
- mkdir $(SRC_DIST_GHC_DIR)
- cd $(SRC_DIST_GHC_DIR) && for i in $(SRC_DIST_GHC_DIRS); do mkdir $$i; ( cd $$i && lndir $(TOP)/$$i ); done
+ mkdir -p $(SRC_DIST_ROOT)
+ mkdir -p $(SRC_DIST_GHC_ROOT)
+ mkdir -p $(SRC_DIST_GHC_DIR)
+ cd $(SRC_DIST_GHC_DIR) && for i in $(SRC_DIST_GHC_DIRS); do mkdir -p $$i; ( cd $$i && lndir $(TOP)/$$i ); done
cd $(SRC_DIST_GHC_DIR) && for i in $(SRC_DIST_GHC_FILES); do $(LN_S) $(TOP)/$$i .; done
cd $(SRC_DIST_GHC_DIR) && $(MAKE) distclean
$(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/tarballs/)
@@ -1174,10 +1174,10 @@ sdist-ghc-prep :
sdist-windows-tarballs-prep :
$(call removeTrees,$(SRC_DIST_WINDOWS_TARBALLS_ROOT))
$(call removeFiles,$(SRC_DIST_WINDOWS_TARBALLS_TARBALL))
- -mkdir $(SRC_DIST_ROOT)
- mkdir $(SRC_DIST_WINDOWS_TARBALLS_ROOT)
- mkdir $(SRC_DIST_WINDOWS_TARBALLS_DIR)
- mkdir $(SRC_DIST_WINDOWS_TARBALLS_DIR)/ghc-tarballs
+ mkdir -p $(SRC_DIST_ROOT)
+ mkdir -p $(SRC_DIST_WINDOWS_TARBALLS_ROOT)
+ mkdir -p $(SRC_DIST_WINDOWS_TARBALLS_DIR)
+ mkdir -p $(SRC_DIST_WINDOWS_TARBALLS_DIR)/ghc-tarballs
cd $(SRC_DIST_WINDOWS_TARBALLS_DIR)/ghc-tarballs && lndir $(TOP)/ghc-tarballs
$(call removeTrees,$(SRC_DIST_WINDOWS_TARBALLS_DIR)/ghc-tarballs/.git)
@@ -1185,10 +1185,10 @@ sdist-windows-tarballs-prep :
sdist-testsuite-prep :
$(call removeTrees,$(SRC_DIST_TESTSUITE_ROOT))
$(call removeFiles,$(SRC_DIST_TESTSUITE_TARBALL))
- -mkdir $(SRC_DIST_ROOT)
- mkdir $(SRC_DIST_TESTSUITE_ROOT)
- mkdir $(SRC_DIST_TESTSUITE_DIR)
- mkdir $(SRC_DIST_TESTSUITE_DIR)/testsuite
+ mkdir -p $(SRC_DIST_ROOT)
+ mkdir -p $(SRC_DIST_TESTSUITE_ROOT)
+ mkdir -p $(SRC_DIST_TESTSUITE_DIR)
+ mkdir -p $(SRC_DIST_TESTSUITE_DIR)/testsuite
cd $(SRC_DIST_TESTSUITE_DIR)/testsuite && lndir $(TOP)/testsuite
.PHONY: sdist-ghc
More information about the ghc-commits
mailing list