diff options
author | Ben Gamari <ben@smart-cactus.org> | 2022-06-08 17:58:43 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2022-06-08 17:58:43 -0400 |
commit | ed5bf152cd3592a879ab3afa6e9a2e1636d14855 (patch) | |
tree | ba61f78670aca14d39da59925d279b595eaeb623 | |
parent | a1651a3afab9b195440436432385d839abb7d389 (diff) | |
download | haskell-wip/T21687.tar.gz |
validate: Ensure that $make variable is setwip/T21687
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-x | validate | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -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..." |