Skip to content
Snippets Groups Projects
Commit ac83899d authored by Ben Gamari's avatar Ben Gamari Committed by Marge Bot
Browse files

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.
parent ad70c621
No related branches found
No related tags found
No related merge requests found
......@@ -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..."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment