summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2017-09-25 18:39:11 -0400
committerBen Gamari <ben@smart-cactus.org>2017-09-25 22:43:52 -0400
commit49c1a20dbbdabc8101877e8ef2c8de9ec3a079d0 (patch)
tree5c9a2a423f7e34cbd6a6ccfea14849e9a95e4e98 /aclocal.m4
parent9738e8b6d91685cb08ad682b511a7eca09ca1cc4 (diff)
downloadhaskell-49c1a20dbbdabc8101877e8ef2c8de9ec3a079d0.tar.gz
configure: Catch case where LLVM tools can't be found
Previously we didn't specify the prog-not-found value passed to AC_CHECK_TOOLS. Reported by @snowleopard in https://github.com/snowleopard/hadrian/issues/415. Test Plan: validate Reviewers: austin, hvr Subscribers: rwbarton, thomie, snowleopard, erikd Differential Revision: https://phabricator.haskell.org/D3992
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m44
1 files changed, 3 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index af84b6fc5e..c89ef0d40d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2035,7 +2035,7 @@ AC_DEFUN([XCODE_VERSION],[
#
AC_DEFUN([FIND_LLVM_PROG],[
# Test for program with and without version name.
- AC_CHECK_TOOLS([$1], [$2-$3 $2])
+ AC_CHECK_TOOLS([$1], [$2-$3 $2], [:])
if test "$$1" != ":"; then
AC_MSG_CHECKING([$$1 is version $3])
if test `$$1 --version | grep -c "version $3"` -gt 0 ; then
@@ -2044,6 +2044,8 @@ AC_DEFUN([FIND_LLVM_PROG],[
AC_MSG_RESULT(no)
$1=""
fi
+ else
+ $1=""
fi
])