summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2018-09-13 10:41:39 -0700
committerAndres Freund <andres@anarazel.de>2018-09-13 10:42:13 -0700
commit99ba795d982efe2305d94573f2f4594bedaf6eab (patch)
treea0acd6dfdcbf2d7e10a755b7a0315ed879716b0b /configure
parentff4220ead2c833fb36e9709ab2568c6ac43e9d3b (diff)
Detect LLVM 7 without specifying binaries explicitly.
Before this commit LLVM 7 was supported, but only if one explicitly provided LLVM_CONFIG= and CLANG= paths. As LLVM 7 is the first version that includes our upstreamed debugging and profiling features, and as debian is planning to default to 7 due to wider architecture support, it seems good to support auto-detecting that version. Author: Christoph Berg Discussion: https://postgr.es/m/20180912124517.GD24584@msg.df7cb.de Backpatch: 11, where LLVM was introduced
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 1f31d794553..28060257e58 100755
--- a/configure
+++ b/configure
@@ -4811,7 +4811,7 @@ done
if test -z "$LLVM_CONFIG"; then
- for ac_prog in llvm-config llvm-config-6.0 llvm-config-5.0 llvm-config-4.0 llvm-config-3.9
+ for ac_prog in llvm-config llvm-config-7 llvm-config-6.0 llvm-config-5.0 llvm-config-4.0 llvm-config-3.9
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4882,7 +4882,7 @@ fi
# need clang to create some bitcode files
if test -z "$CLANG"; then
- for ac_prog in clang clang-6.0 clang-5.0 clang-4.0 clang-3.9
+ for ac_prog in clang clang-7 clang-6.0 clang-5.0 clang-4.0 clang-3.9
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2