Skip to content

Commit b4e5fee

Browse files
authored
Clarify what --enable-optimizations does (GH-1847)
1 parent 7be651c commit b4e5fee

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

configure

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,6 @@ infodir
783783
docdir
784784
oldincludedir
785785
includedir
786-
runstatedir
787786
localstatedir
788787
sharedstatedir
789788
sysconfdir
@@ -895,7 +894,6 @@ datadir='${datarootdir}'
895894
sysconfdir='${prefix}/etc'
896895
sharedstatedir='${prefix}/com'
897896
localstatedir='${prefix}/var'
898-
runstatedir='${localstatedir}/run'
899897
includedir='${prefix}/include'
900898
oldincludedir='/usr/include'
901899
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1148,15 +1146,6 @@ do
11481146
| -silent | --silent | --silen | --sile | --sil)
11491147
silent=yes ;;
11501148

1151-
-runstatedir | --runstatedir | --runstatedi | --runstated \
1152-
| --runstate | --runstat | --runsta | --runst | --runs \
1153-
| --run | --ru | --r)
1154-
ac_prev=runstatedir ;;
1155-
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1156-
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1157-
| --run=* | --ru=* | --r=*)
1158-
runstatedir=$ac_optarg ;;
1159-
11601149
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11611150
ac_prev=sbindir ;;
11621151
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1294,7 +1283,7 @@ fi
12941283
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12951284
datadir sysconfdir sharedstatedir localstatedir includedir \
12961285
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1297-
libdir localedir mandir runstatedir
1286+
libdir localedir mandir
12981287
do
12991288
eval ac_val=\$$ac_var
13001289
# Remove trailing slashes.
@@ -1447,7 +1436,6 @@ Fine tuning of the installation directories:
14471436
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14481437
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14491438
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1450-
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14511439
--libdir=DIR object code libraries [EPREFIX/lib]
14521440
--includedir=DIR C header files [PREFIX/include]
14531441
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1488,8 +1476,8 @@ Optional Features:
14881476
Build (MacOSX|Darwin) framework
14891477
--enable-shared disable/enable building shared python library
14901478
--enable-profiling enable C-level code profiling
1491-
--enable-optimizations Enable expensive optimizations (PGO, etc). Disabled
1492-
by default.
1479+
--enable-optimizations Enable expensive, stable optimizations (PGO, etc).
1480+
Disabled by default.
14931481
--enable-loadable-sqlite-extensions
14941482
support loadable extensions in _sqlite module
14951483
--enable-ipv6 Enable ipv6 (with ipv4) support
@@ -17989,7 +17977,7 @@ mv config.c Modules
1798917977
if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
1799017978
echo "" >&6
1799117979
echo "" >&6
17992-
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&6
17980+
echo "If you want a release build with all stable optimizations active (PGO, etc)," >&6
1799317981
echo "please run ./configure --enable-optimizations" >&6
1799417982
echo "" >&6
1799517983
echo "" >&6

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ AC_SUBST(DEF_MAKE_ALL_RULE)
12771277
AC_SUBST(DEF_MAKE_RULE)
12781278
Py_OPT='false'
12791279
AC_MSG_CHECKING(for --enable-optimizations)
1280-
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]),
1280+
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive, stable optimizations (PGO, etc). Disabled by default.]),
12811281
[
12821282
if test "$enableval" != no
12831283
then
@@ -5469,7 +5469,7 @@ mv config.c Modules
54695469
if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
54705470
echo "" >&AS_MESSAGE_FD
54715471
echo "" >&AS_MESSAGE_FD
5472-
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&AS_MESSAGE_FD
5472+
echo "If you want a release build with all stable optimizations active (PGO, etc)," >&AS_MESSAGE_FD
54735473
echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD
54745474
echo "" >&AS_MESSAGE_FD
54755475
echo "" >&AS_MESSAGE_FD

0 commit comments

Comments
 (0)