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

Commit0b59b0e

Browse files
committed
Fix AC_REQUIRES breakage in LLVM autoconf tests.
Any Autoconf macro that uses AC_REQUIRES -- directly or indirectly --must not be inside a plain shell "if" test; if it is, whatever codegets pulled in by the AC_REQUIRES will also be inside that "if".Instead of "if" we can use AS_IF, which knows how to get this right(cf commit01051a9).The only immediate problem from getting this wrong was that AC_PROG_AWKhad to be run twice, once inside the "if llvm" block and once in themain line. However, it broke a different patch I'm about to submitmore thoroughly.
1 parentd3bbc4b commit0b59b0e

File tree

2 files changed

+4
-48
lines changed

2 files changed

+4
-48
lines changed

‎configure

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4948,8 +4948,7 @@ fi
49484948

49494949

49504950

4951-
if test "$with_llvm" = yes ; then
4952-
for ac_prog in gawk mawk nawk awk
4951+
for ac_prog in gawk mawk nawk awk
49534952
do
49544953
# Extract the first word of "$ac_prog", so it can be a program name with args.
49554954
set dummy $ac_prog; ac_word=$2
@@ -4991,6 +4990,7 @@ fi
49914990
test -n "$AWK" && break
49924991
done
49934992

4993+
if test "$with_llvm" = yes; then :
49944994

49954995

49964996

@@ -9400,48 +9400,6 @@ else
94009400
$as_echo "no, using $LN_S" >&6; }
94019401
fi
94029402

9403-
for ac_prog in gawk mawk nawk awk
9404-
do
9405-
# Extract the first word of "$ac_prog", so it can be a program name with args.
9406-
set dummy $ac_prog; ac_word=$2
9407-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
9408-
$as_echo_n "checking for $ac_word... " >&6; }
9409-
if ${ac_cv_prog_AWK+:} false; then :
9410-
$as_echo_n "(cached) " >&6
9411-
else
9412-
if test -n "$AWK"; then
9413-
ac_cv_prog_AWK="$AWK" # Let the user override the test.
9414-
else
9415-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9416-
for as_dir in $PATH
9417-
do
9418-
IFS=$as_save_IFS
9419-
test -z "$as_dir" && as_dir=.
9420-
for ac_exec_ext in '' $ac_executable_extensions; do
9421-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
9422-
ac_cv_prog_AWK="$ac_prog"
9423-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
9424-
break 2
9425-
fi
9426-
done
9427-
done
9428-
IFS=$as_save_IFS
9429-
9430-
fi
9431-
fi
9432-
AWK=$ac_cv_prog_AWK
9433-
if test -n "$AWK"; then
9434-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
9435-
$as_echo "$AWK" >&6; }
9436-
else
9437-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
9438-
$as_echo "no" >&6; }
9439-
fi
9440-
9441-
9442-
test -n "$AWK" && break
9443-
done
9444-
94459403
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
94469404
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
94479405
if test -z "$MKDIR_P"; then

‎configure.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,8 @@ AC_SUBST(SUN_STUDIO_CC)
391391
PGAC_ARG_BOOL(with, llvm, no, [build with LLVM based JIT support],
392392
[AC_DEFINE([USE_LLVM], 1, [Define to 1 to build with LLVM based JIT support. (--with-llvm)])])
393393
AC_SUBST(with_llvm)
394-
if test "$with_llvm" = yes ; then
395-
PGAC_LLVM_SUPPORT()
396-
fi
394+
dnl must use AS_IF here, else AC_REQUIRES inside PGAC_LLVM_SUPPORT malfunctions
395+
AS_IF([test "$with_llvm" = yes], [PGAC_LLVM_SUPPORT()])
397396

398397

399398
unset CFLAGS
@@ -1020,7 +1019,6 @@ AC_SUBST(install_bin)
10201019

10211020
PGAC_PATH_PROGS(TAR, tar)
10221021
AC_PROG_LN_S
1023-
AC_PROG_AWK
10241022
AC_PROG_MKDIR_P
10251023
# When Autoconf chooses install-sh as mkdir -p program it tries to generate
10261024
# a relative path to it in each makefile where it substitutes it. This clashes

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp