mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 3.3 (#17550)

This commit is contained in:
Benjamin Peterson 2013-03-26 08:58:16 -04:00
parent 711c37076a dbc5f8c39b
commit fccfb824e6
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -1148,6 +1148,8 @@ Tests
Build Build
----- -----
- Issue #17550: Fix the --enable-profiling configure switch.
- Issue #17425: Build with openssl 1.0.1d on Windows. - Issue #17425: Build with openssl 1.0.1d on Windows.
- Issue #16754: Fix the incorrect shared library extension on linux. Introduce - Issue #16754: Fix the incorrect shared library extension on linux. Introduce

2
configure vendored
View File

@ -5534,7 +5534,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

@ -883,7 +883,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])