summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2017-09-04 08:01:04 -0400
committerBen Gamari <ben@smart-cactus.org>2017-09-05 07:20:00 -0400
commita4c2ac2cef3d0ad3c968b8195daf651e672d3435 (patch)
treeb2398244144c5d63f30e082f1c8cdf00be712642
parent1300afaa6d0ab20d7891b2f42d0f02268582692b (diff)
downloadhaskell-a4c2ac2cef3d0ad3c968b8195daf651e672d3435.tar.gz
get-win32-tarballs: Use correct `find`
This fixes #12502 by using the `find` utility found by FP_PROG_FIND instead of the first one in PATH. Test Plan: Validate on Windows Reviewers: Phyx, austin, hvr Reviewed By: Phyx Subscribers: rwbarton, thomie, erikd GHC Trac Issues: #12502 Differential Revision: https://phabricator.haskell.org/D3907
-rw-r--r--distrib/configure.ac.in6
-rwxr-xr-xmk/get-win32-tarballs.sh9
2 files changed, 12 insertions, 3 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 7c27dad64e..9a94cf2c3d 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -63,6 +63,12 @@ dnl ** figure out how to do a BSD-ish install **
AC_PROG_INSTALL
#
+dnl ** find `find`, used by get-win32-tarballs.sh (see #12502)
+#
+FP_PROG_FIND()
+export FIND
+
+#
dnl ** how to do symlinks **
#
AC_PROG_LN_S()
diff --git a/mk/get-win32-tarballs.sh b/mk/get-win32-tarballs.sh
index 75889ee3b1..b3c9e0776a 100755
--- a/mk/get-win32-tarballs.sh
+++ b/mk/get-win32-tarballs.sh
@@ -3,6 +3,9 @@
tarball_dir='ghc-tarballs'
missing_files=0
+# see #12502
+if test -z "$FIND"; then FIND="find"; fi
+
fail() {
echo >&2
echo "$1" >&2
@@ -148,16 +151,16 @@ sync_binaries_and_sources() {
verify=0
download_sources
- for f in $(find ghc-tarballs/mingw-w64 -iname '*.sig'); do
+ for f in $($FIND ghc-tarballs/mingw-w64 -iname '*.sig'); do
echo "Verifying $f"
gpg --verify $f
done
- md5sum `find ghc-tarballs -type f -a -not -iname '*.sig'` >| mk/win32-tarballs.md5sum
+ md5sum `$FIND ghc-tarballs -type f -a -not -iname '*.sig'` >| mk/win32-tarballs.md5sum
chmod -R ugo+rX ghc-tarballs
rsync -av ghc-tarballs/mingw-w64/* downloads.haskell.org:public_html/mingw
- for f in $(find ghc-tarballs/mingw-w64); do
+ for f in $($FIND ghc-tarballs/mingw-w64); do
curl -XPURGE http://downloads.haskell.org/~ghc/mingw/$f
done
}