summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-06-08 17:58:43 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-06-14 08:41:30 -0400
commitac83899dcb5931913699d191f2c46780483ed07e (patch)
tree2d292d801cd2b11dba4d6a913cba05d1d6ece8b3
parentad70c621c4ca2c99232c3711050a6ab88184a10a (diff)
downloadhaskell-ac83899dcb5931913699d191f2c46780483ed07e.tar.gz
validate: Ensure that $make variable is set
Currently the `$make` variable is used without being set in `validate`'s Hadrian path, which uses make to install the binary distribution. Fix this. Fixes #21687.
-rwxr-xr-xvalidate22
1 files changed, 11 insertions, 11 deletions
diff --git a/validate b/validate
index e6a8d91563..92d45998ed 100755
--- a/validate
+++ b/validate
@@ -180,19 +180,19 @@ echo "using THREADS=${threads}" >&2
configure_cmd="./configure"
-# Set up configuration, commands for building
-if [ "$use_hadrian" = "NO" ]; then
+make="gmake"
+if type gmake > /dev/null 2> /dev/null ; then
make="gmake"
- if type gmake > /dev/null 2> /dev/null ; then
- make="gmake"
- else
- make="make"
- fi
- if [ $be_quiet -eq 1 ]; then
- # See Note [Default build system verbosity].
- make="$make -s"
- fi
else
+ make="make"
+fi
+if [ $be_quiet -eq 1 ]; then
+ # See Note [Default build system verbosity].
+ make="$make -s"
+fi
+
+# Set up configuration, commands for building
+if [ "$use_hadrian" = "YES" ]; then
if [ "$use_stack" = "NO" ]; then
hadrian/build --help > /dev/null
echo "Entering ./hadrian directory..."