mirror of https://github.com/python/cpython
Rename the new --with-optimiations flag to --enable-optimizations.
This commit is contained in:
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D)
commit
164eea5443
|
|
@ -931,6 +931,8 @@ Tests
|
|||
Build
|
||||
-----
|
||||
|
||||
- Issue #26359: Rename --with-optimiations to --enable-optimizations.
|
||||
|
||||
- Issue #27566: Fix clean target in freeze makefile (patch by Lisa Roach)
|
||||
|
||||
- Issue #27705: Update message in validate_ucrtbase.py
|
||||
|
|
|
|||
|
|
@ -784,6 +784,7 @@ infodir
|
|||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
|
|
@ -817,7 +818,7 @@ with_suffix
|
|||
enable_shared
|
||||
enable_profiling
|
||||
with_pydebug
|
||||
with_optimizations
|
||||
enable_optimizations
|
||||
with_lto
|
||||
with_hash_algorithm
|
||||
with_address_sanitizer
|
||||
|
|
@ -894,6 +895,7 @@ datadir='${datarootdir}'
|
|||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
|
|
@ -1146,6 +1148,15 @@ do
|
|||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
|
|
@ -1283,7 +1294,7 @@ fi
|
|||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
|
|
@ -1436,6 +1447,7 @@ Fine tuning of the installation directories:
|
|||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
|
|
@ -1476,6 +1488,8 @@ Optional Features:
|
|||
Build (MacOSX|Darwin) framework
|
||||
--enable-shared disable/enable building shared python library
|
||||
--enable-profiling enable C-level code profiling
|
||||
--enable-optimizations Enable expensive optimizations (PGO, etc). Disabled
|
||||
by default.
|
||||
--enable-loadable-sqlite-extensions
|
||||
support loadable extensions in _sqlite module
|
||||
--enable-ipv6 Enable ipv6 (with ipv4) support
|
||||
|
|
@ -1499,8 +1513,6 @@ Optional Packages:
|
|||
compiler
|
||||
--with-suffix=.exe set executable suffix
|
||||
--with-pydebug build with Py_DEBUG defined
|
||||
--with-optimizations Enable expensive optimizations (PGO, etc). Disabled
|
||||
by default.
|
||||
--with-lto Enable Link Time Optimization in PGO builds.
|
||||
Disabled by default.
|
||||
--with-hash-algorithm=[fnv|siphash24]
|
||||
|
|
@ -6524,12 +6536,11 @@ fi
|
|||
|
||||
|
||||
Py_OPT='false'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-optimizations" >&5
|
||||
$as_echo_n "checking for --with-optimizations... " >&6; }
|
||||
|
||||
# Check whether --with-optimizations was given.
|
||||
if test "${with_optimizations+set}" = set; then :
|
||||
withval=$with_optimizations;
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5
|
||||
$as_echo_n "checking for --enable-optimizations... " >&6; }
|
||||
# Check whether --enable-optimizations was given.
|
||||
if test "${enable_optimizations+set}" = set; then :
|
||||
enableval=$enable_optimizations;
|
||||
if test "$withval" != no
|
||||
then
|
||||
Py_OPT='true'
|
||||
|
|
@ -6796,7 +6807,7 @@ case $CC in
|
|||
LLVM_PROF_ERR=yes
|
||||
if test "${REQUIRE_PGO}" = "yes"
|
||||
then
|
||||
as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
|
||||
as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
|
@ -6812,7 +6823,7 @@ case $CC in
|
|||
LLVM_PROF_ERR=yes
|
||||
if test "${REQUIRE_PGO}" = "yes"
|
||||
then
|
||||
as_fn_error $? "llvm-profdata is required for a --with-optimizations build but could not be found." "$LINENO" 5
|
||||
as_fn_error $? "llvm-profdata is required for a --enable-optimizations build but could not be found." "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
|
@ -17861,7 +17872,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
|
|||
echo "" >&6
|
||||
echo "" >&6
|
||||
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&6
|
||||
echo "please run ./configure --with-optimizations" >&6
|
||||
echo "please run ./configure --enable-optimizations" >&6
|
||||
echo "" >&6
|
||||
echo "" >&6
|
||||
fi
|
||||
|
|
|
|||
10
configure.ac
10
configure.ac
|
|
@ -1281,8 +1281,8 @@ fi],
|
|||
AC_SUBST(DEF_MAKE_ALL_RULE)
|
||||
AC_SUBST(DEF_MAKE_RULE)
|
||||
Py_OPT='false'
|
||||
AC_MSG_CHECKING(for --with-optimizations)
|
||||
AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]),
|
||||
AC_MSG_CHECKING(for --enable-optimizations)
|
||||
AC_ARG_ENABLE(optimizations, AS_HELP_STRING([--enable-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]),
|
||||
[
|
||||
if test "$withval" != no
|
||||
then
|
||||
|
|
@ -1405,7 +1405,7 @@ case $CC in
|
|||
LLVM_PROF_ERR=yes
|
||||
if test "${REQUIRE_PGO}" = "yes"
|
||||
then
|
||||
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
|
||||
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
|
@ -1421,7 +1421,7 @@ case $CC in
|
|||
LLVM_PROF_ERR=yes
|
||||
if test "${REQUIRE_PGO}" = "yes"
|
||||
then
|
||||
AC_MSG_ERROR([llvm-profdata is required for a --with-optimizations build but could not be found.])
|
||||
AC_MSG_ERROR([llvm-profdata is required for a --enable-optimizations build but could not be found.])
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
|
@ -5395,7 +5395,7 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
|
|||
echo "" >&AS_MESSAGE_FD
|
||||
echo "" >&AS_MESSAGE_FD
|
||||
echo "If you want a release build with all optimizations active (LTO, PGO, etc)," >&AS_MESSAGE_FD
|
||||
echo "please run ./configure --with-optimizations" >&AS_MESSAGE_FD
|
||||
echo "please run ./configure --enable-optimizations" >&AS_MESSAGE_FD
|
||||
echo "" >&AS_MESSAGE_FD
|
||||
echo "" >&AS_MESSAGE_FD
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue