Allow setting path for LLC/OPT during configuration

Patch configure.ac to allow us to modify the path for LLC/OPT during
configuration.

Gbp-Pq: Name allow-setting-llvm-program

diff --git a/configure.ac b/configure.ac
index 3b39615b1c62665c7c07c968f93c6065373ea883..5d411c55834adbf7f67a29289b6df2aac2f8640e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -600,14 +600,18 @@ AC_SUBST([ClangCmd])
 dnl ** Which LLVM llc to use?
 dnl --------------------------------------------------------------
 AC_ARG_VAR(LLC,[Use as the path to LLVM's llc [default=autodetect]])
-FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion])
+if test -z "$LLC"; then
+  FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion])
+fi
 LlcCmd="$LLC"
 AC_SUBST([LlcCmd])
 
 dnl ** Which LLVM opt to use?
 dnl --------------------------------------------------------------
 AC_ARG_VAR(OPT,[Use as the path to LLVM's opt [default=autodetect]])
-FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion])
+if test -z "$OPT"; then
+  FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion])
+fi
 OptCmd="$OPT"
 AC_SUBST([OptCmd])
 

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index a1e4d6d21f4822ce8131794abb790984ee900025..0317fd6903de471d06f8c69ab05f5539c1358ad6 100644 (file)
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -145,14 +145,18 @@ LlvmMaxVersion=@LlvmMaxVersion@
 dnl ** Which LLVM llc to use?
 dnl --------------------------------------------------------------
 AC_ARG_VAR(LLC,[Use as the path to LLVM's llc [default=autodetect]])
-FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion])
+if test -z "$LLC"; then
+  FIND_LLVM_PROG([LLC], [llc], [$LlvmMinVersion], [$LlvmMaxVersion])
+fi
 LlcCmd="$LLC"
 AC_SUBST([LlcCmd])
 
 dnl ** Which LLVM opt to use?
 dnl --------------------------------------------------------------
 AC_ARG_VAR(OPT,[Use as the path to LLVM's opt [default=autodetect]])
-FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion])
+if test -z "$OPT"; then
+  FIND_LLVM_PROG([OPT], [opt], [$LlvmMinVersion], [$LlvmMaxVersion])
+fi
 OptCmd="$OPT"
 AC_SUBST([OptCmd])