Commit 4b394db4 authored by Benjamin Peterson's avatar Benjamin Peterson

merge 2.7.4 release branch (#17550)

parents 1e76e864 b9be7bbe
......@@ -18,6 +18,11 @@ What's New in Python 2.7.4?
*Release date: XXXX-XX-XX*
Build
-----
- Issue #17550: Fix the --enable-profiling configure switch.
Core and Builtins
-----------------
......
......@@ -5281,7 +5281,7 @@ fi
if test "x$enable_profiling" = xyes; then
ac_save_cc="$CC"
CC="$(CC) -pg"
CC="$CC -pg"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int main() { return 0; }
......
......@@ -833,7 +833,7 @@ AC_ARG_ENABLE(profiling,
AS_HELP_STRING([--enable-profiling], [enable C-level code profiling]))
if test "x$enable_profiling" = xyes; then
ac_save_cc="$CC"
CC="$(CC) -pg"
CC="$CC -pg"
AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
[],
[enable_profiling=no])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment