[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.4 release branch (#17550)

benjamin.peterson python-checkins at python.org
Tue Mar 26 13:58:32 CET 2013


http://hg.python.org/cpython/rev/d321885ff8f3
changeset:   82963:d321885ff8f3
branch:      2.7
parent:      82955:e35eafc872cd
parent:      82962:27cb49ede303
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Mar 26 08:56:16 2013 -0400
summary:
  merge 2.7.4 release branch (#17550)

files:
  Misc/NEWS    |  5 +++++
  configure    |  2 +-
  configure.ac |  2 +-
  3 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,11 @@
 
 *Release date: XXXX-XX-XX*
 
+Build
+-----
+
+- Issue #17550: Fix the --enable-profiling configure switch.
+
 Core and Builtins
 -----------------
 
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5281,7 +5281,7 @@
 
 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
--- a/configure.ac
+++ b/configure.ac
@@ -833,7 +833,7 @@
               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])

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list