mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 2.7.4 release branch (#17550)

Browse source
This commit is contained in:
Benjamin Peterson 2013-03-26 08:56:16 -04:00
commit 4b394db41f
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Misc/NEWS
View file

@ -18,6 +18,11 @@ What's New in Python 2.7.4?
*Release date: XXXX-XX-XX* *Release date: XXXX-XX-XX*
Build
-----
- Issue #17550: Fix the --enable-profiling configure switch.
Core and Builtins Core and Builtins
----------------- -----------------

2
configure vendored
View file

@ -5281,7 +5281,7 @@ fi
if test "x$enable_profiling" = xyes; then if test "x$enable_profiling" = xyes; then
ac_save_cc="$CC" ac_save_cc="$CC"
CC="$(CC) -pg" CC="$CC -pg"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
int main() { return 0; } int main() { return 0; }

2
configure.ac
View file

@ -833,7 +833,7 @@ AC_ARG_ENABLE(profiling,
AS_HELP_STRING([--enable-profiling], [enable C-level code profiling])) AS_HELP_STRING([--enable-profiling], [enable C-level code profiling]))
if test "x$enable_profiling" = xyes; then if test "x$enable_profiling" = xyes; then
ac_save_cc="$CC" ac_save_cc="$CC"
CC="$(CC) -pg" CC="$CC -pg"
AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
[], [],
[enable_profiling=no]) [enable_profiling=no])