diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-08-01 09:23:24 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-08-01 09:24:52 -0400 |
| commit | 90bf11c6519783a7d686d02e1fc6f6f50298b850 (patch) | |
| tree | 0a188ef098fbc0e44d50fcc0dbc0f45178544685 | |
| parent | 5e04841c4641e2249066614065053166657e3eb4 (diff) | |
| download | haskell-wip/fix-llvm-detection.tar.gz | |
configure: Search for LLVM executables with two-number versionswip/fix-llvm-detection
Fedora uses the naming llc-7.0 while Debian uses llc-7. Ensure that both
are found.
Fixes #16990.
| -rw-r--r-- | aclocal.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 0d564f3885..dd5efdf61a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2112,7 +2112,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 @@ -2120,7 +2121,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 |