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:11 -0700
commit240d40db88ec0e6f98ac547759bac8e331f3ba89 (patch)
tree2cdf5b6a29e8333937d633d5f14d907fb4bb2027 /configure
parent23bd3cec6eb1ffb80ed2601c13f89d89e658fcc1 (diff)
downloadpostgresql-240d40db88ec0e6f98ac547759bac8e331f3ba89.tar.gz
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 dd77742c46..c6a44a9078 100755
--- a/configure
+++ b/configure
@@ -4995,7 +4995,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
@@ -5066,7 +5066,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