diff options
author | Benjamin Peterson <benjamin@python.org> | 2013-03-26 08:58:16 -0400 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2013-03-26 08:58:16 -0400 |
commit | fccfb824e60ad5871f76d889159bd1ff4a16b81b (patch) | |
tree | 297850c3979bfa22c4f0e30b356b35990ead3a22 | |
parent | 711c37076a954bb9a6109f0a150da369749ae0e8 (diff) | |
parent | dbc5f8c39bdc2a6b16ef59125f9fa872e765b327 (diff) | |
download | cpython-git-fccfb824e60ad5871f76d889159bd1ff4a16b81b.tar.gz |
merge 3.3 (#17550)
-rw-r--r-- | Misc/NEWS | 2 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -1148,6 +1148,8 @@ Tests Build ----- +- Issue #17550: Fix the --enable-profiling configure switch. + - Issue #17425: Build with openssl 1.0.1d on Windows. - Issue #16754: Fix the incorrect shared library extension on linux. Introduce @@ -5534,7 +5534,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; } diff --git a/configure.ac b/configure.ac index 12dde47be4..caef808348 100644 --- a/configure.ac +++ b/configure.ac @@ -883,7 +883,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]) |