Skip to content

Commit 97d7ba4

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

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
@@ -681,10 +681,6 @@ LLVM_PROF_MERGER
681681
PGO_PROF_USE_FLAG
682682
PGO_PROF_GEN_FLAG
683683
LLVM_AR_FOUND
684-
target_os
685-
target_vendor
686-
target_cpu
687-
target
688684
LLVM_AR
689685
PROFILE_TASK
690686
DEF_MAKE_RULE
@@ -1473,7 +1469,6 @@ _ACEOF
14731469
System types:
14741470
--build=BUILD configure for building on BUILD [guessed]
14751471
--host=HOST cross-compile to build programs to run on HOST [BUILD]
1476-
--target=TARGET configure for building compilers for TARGET [HOST]
14771472
_ACEOF
14781473
fi
14791474

@@ -6498,47 +6493,9 @@ if test "$Py_LTO" = 'true' ; then
64986493
case $CC in
64996494
*clang*)
65006495

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

65796536

6537+
fi
65806538
if test -z "$ac_cv_path_LLVM_AR"; then
6581-
if test "$build" = "$target"; then
6582-
ac_pt_LLVM_AR=$LLVM_AR
6583-
# Extract the first word of "llvm-ar", so it can be a program name with args.
6539+
ac_pt_LLVM_AR=$LLVM_AR
6540+
# Extract the first word of "llvm-ar", so it can be a program name with args.
65846541
set dummy llvm-ar; ac_word=$2
65856542
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
65866543
$as_echo_n "checking for $ac_word... " >&6; }
@@ -6607,7 +6564,6 @@ done
66076564
done
66086565
IFS=$as_save_IFS
66096566

6610-
test -z "$ac_cv_path_ac_pt_LLVM_AR" && ac_cv_path_ac_pt_LLVM_AR="''"
66116567
;;
66126568
esac
66136569
fi
@@ -6620,9 +6576,16 @@ else
66206576
$as_echo "no" >&6; }
66216577
fi
66226578

6623-
LLVM_AR=$ac_pt_LLVM_AR
6624-
else
6579+
if test "x$ac_pt_LLVM_AR" = x; then
66256580
LLVM_AR="''"
6581+
else
6582+
case $cross_compiling:$ac_tool_warned in
6583+
yes:)
6584+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6585+
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6586+
ac_tool_warned=yes ;;
6587+
esac
6588+
LLVM_AR=$ac_pt_LLVM_AR
66266589
fi
66276590
else
66286591
LLVM_AR="$ac_cv_path_LLVM_AR"
@@ -6694,8 +6657,9 @@ fi
66946657

66956658

66966659

6697-
# Extract the first word of "$target_alias-llvm-profdata", so it can be a program name with args.
6698-
set dummy $target_alias-llvm-profdata; ac_word=$2
6660+
if test -n "$ac_tool_prefix"; then
6661+
# Extract the first word of "${ac_tool_prefix}llvm-profdata", so it can be a program name with args.
6662+
set dummy ${ac_tool_prefix}llvm-profdata; ac_word=$2
66996663
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
67006664
$as_echo_n "checking for $ac_word... " >&6; }
67016665
if ${ac_cv_path_LLVM_PROFDATA+:} false; then :
@@ -6734,10 +6698,10 @@ $as_echo "no" >&6; }
67346698
fi
67356699

67366700

6701+
fi
67376702
if test -z "$ac_cv_path_LLVM_PROFDATA"; then
6738-
if test "$build" = "$target"; then
6739-
ac_pt_LLVM_PROFDATA=$LLVM_PROFDATA
6740-
# Extract the first word of "llvm-profdata", so it can be a program name with args.
6703+
ac_pt_LLVM_PROFDATA=$LLVM_PROFDATA
6704+
# Extract the first word of "llvm-profdata", so it can be a program name with args.
67416705
set dummy llvm-profdata; ac_word=$2
67426706
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
67436707
$as_echo_n "checking for $ac_word... " >&6; }
@@ -6764,7 +6728,6 @@ done
67646728
done
67656729
IFS=$as_save_IFS
67666730

6767-
test -z "$ac_cv_path_ac_pt_LLVM_PROFDATA" && ac_cv_path_ac_pt_LLVM_PROFDATA="''"
67686731
;;
67696732
esac
67706733
fi
@@ -6777,9 +6740,16 @@ else
67776740
$as_echo "no" >&6; }
67786741
fi
67796742

6780-
LLVM_PROFDATA=$ac_pt_LLVM_PROFDATA
6781-
else
6743+
if test "x$ac_pt_LLVM_PROFDATA" = x; then
67826744
LLVM_PROFDATA="''"
6745+
else
6746+
case $cross_compiling:$ac_tool_warned in
6747+
yes:)
6748+
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6749+
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6750+
ac_tool_warned=yes ;;
6751+
esac
6752+
LLVM_PROFDATA=$ac_pt_LLVM_PROFDATA
67836753
fi
67846754
else
67856755
LLVM_PROFDATA="$ac_cv_path_LLVM_PROFDATA"

0 commit comments

Comments
 (0)