diff options
| author | David Terei <davidterei@gmail.com> | 2013-02-10 23:24:27 -0800 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2013-02-14 04:10:27 +0100 |
| commit | 64aaaa19aa32c69a13daa375c8316041a44eed5c (patch) | |
| tree | 479c566d09cd6202c68e6267bdf84f98e59309fe /configure.ac | |
| parent | 6571f4f110248221fb3fa0ac8e5b2584cb2c5b84 (diff) | |
| download | haskell-64aaaa19aa32c69a13daa375c8316041a44eed5c.tar.gz | |
Find LLVM tools when version number at end (e.g., llc-3.0) (#7661)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9409900bf4..3aa867662c 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ dnl ** which are needed by FP_SETUP_PROJECT_VERSION dnl ** Find find command (for Win32's benefit) FP_PROG_FIND +FP_PROG_SORT dnl ---------------------------------------------------------- FP_SETUP_PROJECT_VERSION @@ -505,13 +506,13 @@ esac dnl ** Which LLVM llc to use? dnl -------------------------------------------------------------- -FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([LLC], [llc], [llc]) +FIND_LLVM_PROG([LLC], [llc], [llc]) LlcCmd="$LLC" AC_SUBST([LlcCmd]) dnl ** Which LLVM opt to use? dnl -------------------------------------------------------------- -FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL([OPT], [opt], [opt]) +FIND_LLVM_PROG([OPT], [opt], [opt]) OptCmd="$OPT" AC_SUBST([OptCmd]) @@ -1001,6 +1002,8 @@ echo ["\ which is version : $GccVersion Building a cross compiler : $CrossCompiling + llc : $LlcCmd + opt : $OptCmd ld : $LdCmd Happy : $HappyCmd ($HappyVersion) Alex : $AlexCmd ($AlexVersion) |