Skip to content

Commit 0a5a1a1

Browse files
Run autoreconf. (GH-16106)
(cherry picked from commit f3095b0) Co-authored-by: Benjamin Peterson <[email protected]>
1 parent d112ea6 commit 0a5a1a1

File tree

1 file changed

+30
-60
lines changed

1 file changed

+30
-60
lines changed

configure

Lines changed: 30 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,6 @@ LLVM_PROF_MERGER
680680
PGO_PROF_USE_FLAG
681681
PGO_PROF_GEN_FLAG
682682
LLVM_AR_FOUND
683-
target_os
684-
target_vendor
685-
target_cpu
686-
target
687683
LLVM_AR
688684
DEF_MAKE_RULE
689685
DEF_MAKE_ALL_RULE
@@ -1459,7 +1455,6 @@ _ACEOF
14591455
System types:
14601456
--build=BUILD configure for building on BUILD [guessed]
14611457
--host=HOST cross-compile to build programs to run on HOST [BUILD]
1462-
--target=TARGET configure for building compilers for TARGET [HOST]
14631458
_ACEOF
14641459
fi
14651460

@@ -6486,47 +6481,9 @@ if test "$Py_LTO" = 'true' ; then
64866481
case $CC in
64876482
*clang*)
64886483

6489-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
6490-
$as_echo_n "checking target system type... " >&6; }
6491-
if ${ac_cv_target+:} false; then :
6492-
$as_echo_n "(cached) " >&6
6493-
else
6494-
if test "x$target_alias" = x; then
6495-
ac_cv_target=$ac_cv_host
6496-
else
6497-
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
6498-
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
6499-
fi
6500-
6501-
fi
6502-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
6503-
$as_echo "$ac_cv_target" >&6; }
6504-
case $ac_cv_target in
6505-
*-*-*) ;;
6506-
*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
6507-
esac
6508-
target=$ac_cv_target
6509-
ac_save_IFS=$IFS; IFS='-'
6510-
set x $ac_cv_target
6511-
shift
6512-
target_cpu=$1
6513-
target_vendor=$2
6514-
shift; shift
6515-
# Remember, the first character of IFS is used to create $*,
6516-
# except with old shells:
6517-
target_os=$*
6518-
IFS=$ac_save_IFS
6519-
case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
6520-
6521-
6522-
# The aliases save the names the user supplied, while $host etc.
6523-
# will get canonicalized.
6524-
test -n "$target_alias" &&
6525-
test "$program_prefix$program_suffix$program_transform_name" = \
6526-
NONENONEs,x,x, &&
6527-
program_prefix=${target_alias}-
6528-
# Extract the first word of "$target_alias-llvm-ar", so it can be a program name with args.
6529-
set dummy $target_alias-llvm-ar; ac_word=$2
6484+
if test -n "$ac_tool_prefix"; then
6485+
# Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args.
6486+
set dummy ${ac_tool_prefix}llvm-ar; ac_word=$2
65306487
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
65316488
$as_echo_n "checking for $ac_word... " >&6; }
65326489
if ${ac_cv_path_LLVM_AR+:} false; then :
@@ -6565,10 +6522,10 @@ $as_echo "no" >&6; }
65656522
fi
65666523

65676524

6525+
fi
65686526
if test -z "$ac_cv_path_LLVM_AR"; then
6569-
if test "$build" = "$target"; then
6570-
ac_pt_LLVM_AR=$LLVM_AR
6571-
# Extract the first word of "llvm-ar", so it can be a program name with args.
6527+
ac_pt_LLVM_AR=$LLVM_AR
6528+
# Extract the first word of "llvm-ar", so it can be a program name with args.
65726529
set dummy llvm-ar; ac_word=$2
65736530
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
65746531
$as_echo_n "checking for $ac_word... " >&6; }
@@ -6595,7 +6552,6 @@ done
65956552
done
65966553
IFS=$as_save_IFS
65976554

6598-
test -z "$ac_cv_path_ac_pt_LLVM_AR" && ac_cv_path_ac_pt_LLVM_AR="''"
65996555
;;
66006556
esac
66016557
fi
@@ -6608,9 +6564,16 @@ else
66086564
$as_echo "no" >&6; }
66096565
fi
66106566

6611-
LLVM_AR=$ac_pt_LLVM_AR
6612-
else
6567+
if test "x$ac_pt_LLVM_AR" = x; then
66136568
LLVM_AR="''"
6569+
else
6570+
case $cross_compiling:$ac_tool_warned in
6571+
yes:)
6572+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6573+
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6574+
ac_tool_warned=yes ;;
6575+
esac
6576+
LLVM_AR=$ac_pt_LLVM_AR
66146577
fi
66156578
else
66166579
LLVM_AR="$ac_cv_path_LLVM_AR"
@@ -6682,8 +6645,9 @@ fi
66826645

66836646

66846647

6685-
# Extract the first word of "$target_alias-llvm-profdata", so it can be a program name with args.
6686-
set dummy $target_alias-llvm-profdata; ac_word=$2
6648+
if test -n "$ac_tool_prefix"; then
6649+
# Extract the first word of "${ac_tool_prefix}llvm-profdata", so it can be a program name with args.
6650+
set dummy ${ac_tool_prefix}llvm-profdata; ac_word=$2
66876651
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
66886652
$as_echo_n "checking for $ac_word... " >&6; }
66896653
if ${ac_cv_path_LLVM_PROFDATA+:} false; then :
@@ -6722,10 +6686,10 @@ $as_echo "no" >&6; }
67226686
fi
67236687

67246688

6689+
fi
67256690
if test -z "$ac_cv_path_LLVM_PROFDATA"; then
6726-
if test "$build" = "$target"; then
6727-
ac_pt_LLVM_PROFDATA=$LLVM_PROFDATA
6728-
# Extract the first word of "llvm-profdata", so it can be a program name with args.
6691+
ac_pt_LLVM_PROFDATA=$LLVM_PROFDATA
6692+
# Extract the first word of "llvm-profdata", so it can be a program name with args.
67296693
set dummy llvm-profdata; ac_word=$2
67306694
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
67316695
$as_echo_n "checking for $ac_word... " >&6; }
@@ -6752,7 +6716,6 @@ done
67526716
done
67536717
IFS=$as_save_IFS
67546718

6755-
test -z "$ac_cv_path_ac_pt_LLVM_PROFDATA" && ac_cv_path_ac_pt_LLVM_PROFDATA="''"
67566719
;;
67576720
esac
67586721
fi
@@ -6765,9 +6728,16 @@ else
67656728
$as_echo "no" >&6; }
67666729
fi
67676730

6768-
LLVM_PROFDATA=$ac_pt_LLVM_PROFDATA
6769-
else
6731+
if test "x$ac_pt_LLVM_PROFDATA" = x; then
67706732
LLVM_PROFDATA="''"
6733+
else
6734+
case $cross_compiling:$ac_tool_warned in
6735+
yes:)
6736+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6737+
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6738+
ac_tool_warned=yes ;;
6739+
esac
6740+
LLVM_PROFDATA=$ac_pt_LLVM_PROFDATA
67716741
fi
67726742
else
67736743
LLVM_PROFDATA="$ac_cv_path_LLVM_PROFDATA"

0 commit comments

Comments
 (0)