Skip to content

Commit 5668510

Browse files
committed
bpo-44340: Update
1 parent ce0757f commit 5668510

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

configure

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6601,7 +6601,7 @@ $as_echo "yes" >&6; }
66016601
;;
66026602
yes)
66036603
Py_LTO='true'
6604-
Py_LTO_POLICY='full'
6604+
Py_LTO_POLICY='default'
66056605
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
66066606
$as_echo "yes" >&6; }
66076607
;;
@@ -6753,11 +6753,22 @@ $as_echo "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;}
67536753
case $ac_sys_system in
67546754
Darwin*)
67556755
# Any changes made here should be reflected in the GCC+Darwin case below
6756-
LTOFLAGS="-flto=${Py_LTO_POLICY} -Wl,-export_dynamic"
6757-
LTOCFLAGS="-flto=${Py_LTO_POLICY}"
6756+
if test $Py_LTO_POLICY = 'default'
6757+
then
6758+
LTOFLAGS="-flto -Wl,-export_dynamic"
6759+
LTOCFLAGS="-flto"
6760+
else
6761+
LTOFLAGS="-flto=${Py_LTO_POLICY} -Wl,-export_dynamic"
6762+
LTOCFLAGS="-flto=${Py_LTO_POLICY}"
6763+
fi
67586764
;;
67596765
*)
6760-
LTOFLAGS="-flto={Py_LTO_POLICY}"
6766+
if test $Py_LTO_POLICY = 'default'
6767+
then
6768+
LTOFLAGS="-flto"
6769+
else
6770+
LTOFLAGS="-flto={Py_LTO_POLICY}"
6771+
fi
67616772
;;
67626773
esac
67636774
;;

configure.ac

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ case "$withval" in
13751375
;;
13761376
yes)
13771377
Py_LTO='true'
1378-
Py_LTO_POLICY='full'
1378+
Py_LTO_POLICY='default'
13791379
AC_MSG_RESULT(yes)
13801380
;;
13811381
no)
@@ -1423,11 +1423,22 @@ if test "$Py_LTO" = 'true' ; then
14231423
case $ac_sys_system in
14241424
Darwin*)
14251425
# Any changes made here should be reflected in the GCC+Darwin case below
1426-
LTOFLAGS="-flto=${Py_LTO_POLICY} -Wl,-export_dynamic"
1427-
LTOCFLAGS="-flto=${Py_LTO_POLICY}"
1426+
if test $Py_LTO_POLICY = 'default'
1427+
then
1428+
LTOFLAGS="-flto -Wl,-export_dynamic"
1429+
LTOCFLAGS="-flto"
1430+
else
1431+
LTOFLAGS="-flto=${Py_LTO_POLICY} -Wl,-export_dynamic"
1432+
LTOCFLAGS="-flto=${Py_LTO_POLICY}"
1433+
fi
14281434
;;
14291435
*)
1430-
LTOFLAGS="-flto={Py_LTO_POLICY}"
1436+
if test $Py_LTO_POLICY = 'default'
1437+
then
1438+
LTOFLAGS="-flto"
1439+
else
1440+
LTOFLAGS="-flto={Py_LTO_POLICY}"
1441+
fi
14311442
;;
14321443
esac
14331444
;;

0 commit comments

Comments
 (0)