diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-08-01 09:23:24 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-11-03 15:24:32 -0500 |
| commit | 140f0a7484442f6651b10926f932caf94440b4c4 (patch) | |
| tree | e2b66afebd1611f23733aa562bf001de48f45364 | |
| parent | d9e01a963a9cffe64ae4f9a66739135e5b3eec29 (diff) | |
| download | haskell-140f0a7484442f6651b10926f932caf94440b4c4.tar.gz | |
configure: Search for LLVM executables with two-number versions
Fedora uses the naming llc-7.0 while Debian uses llc-7. Ensure that both
are found.
Fixes #16990.
(cherry picked from commit 90bf11c6519783a7d686d02e1fc6f6f50298b850)
| -rw-r--r-- | aclocal.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 082ec54d19..41cecf098b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2132,7 +2132,8 @@ AC_DEFUN([XCODE_VERSION],[ # FIND_LLVM_PROG() # -------------------------------- # Find where the llvm tools are. We have a special function to handle when they -# are installed with a version suffix (e.g., llc-3.1). +# are installed with a version suffix (e.g., llc-7, llc-7.0) and without (e.g. +# llc). # # $1 = the variable to set # $2 = the command to look for @@ -2140,7 +2141,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-$3.0 $2], [:]) if test "$$1" != ":"; then AC_MSG_CHECKING([$$1 is version $3]) if test `$$1 --version | grep -c "version $3"` -gt 0 ; then |