Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit240d40d

Browse files
committed
Detect LLVM 7 without specifying binaries explicitly.
Before this commit LLVM 7 was supported, but only if one explicitlyprovided LLVM_CONFIG= and CLANG= paths. As LLVM 7 is the firstversion that includes our upstreamed debugging and profiling features,and as debian is planning to default to 7 due to wider architecturesupport, it seems good to support auto-detecting that version.Author: Christoph BergDiscussion:https://postgr.es/m/20180912124517.GD24584@msg.df7cb.deBackpatch: 11, where LLVM was introduced
1 parent23bd3ce commit240d40d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎config/llvm.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
1313
AC_REQUIRE([AC_PROG_AWK])
1414
1515
AC_ARG_VAR(LLVM_CONFIG,[path to llvm-config command])
16-
PGAC_PATH_PROGS(LLVM_CONFIG, llvm-config llvm-config-6.0 llvm-config-5.0 llvm-config-4.0 llvm-config-3.9)
16+
PGAC_PATH_PROGS(LLVM_CONFIG, llvm-config llvm-config-7 llvm-config-6.0 llvm-config-5.0 llvm-config-4.0 llvm-config-3.9)
1717
1818
# no point continuing if llvm wasn't found
1919
if test -z "$LLVM_CONFIG"; then
@@ -31,7 +31,7 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
3131
3232
# need clang to create some bitcode files
3333
AC_ARG_VAR(CLANG,[path to clang compiler to generate bitcode])
34-
PGAC_PATH_PROGS(CLANG, clang clang-6.0 clang-5.0 clang-4.0 clang-3.9)
34+
PGAC_PATH_PROGS(CLANG, clang clang-7 clang-6.0 clang-5.0 clang-4.0 clang-3.9)
3535
if test -z "$CLANG"; then
3636
AC_MSG_ERROR([clang not found, but required when compiling --with-llvm, specify with CLANG=])
3737
fi

‎configure‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4995,7 +4995,7 @@ done
49954995

49964996

49974997
if test -z "$LLVM_CONFIG"; then
4998-
for ac_prog in llvm-config llvm-config-6.0 llvm-config-5.0 llvm-config-4.0 llvm-config-3.9
4998+
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
49994999
do
50005000
# Extract the first word of "$ac_prog", so it can be a program name with args.
50015001
set dummy $ac_prog; ac_word=$2
@@ -5066,7 +5066,7 @@ fi
50665066
# need clang to create some bitcode files
50675067

50685068
if test -z "$CLANG"; then
5069-
for ac_prog in clang clang-6.0 clang-5.0 clang-4.0 clang-3.9
5069+
for ac_prog in clang clang-7 clang-6.0 clang-5.0 clang-4.0 clang-3.9
50705070
do
50715071
# Extract the first word of "$ac_prog", so it can be a program name with args.
50725072
set dummy $ac_prog; ac_word=$2

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp