summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-03-26 08:58:16 -0400
committerBenjamin Peterson <benjamin@python.org>2013-03-26 08:58:16 -0400
commitfccfb824e60ad5871f76d889159bd1ff4a16b81b (patch)
tree297850c3979bfa22c4f0e30b356b35990ead3a22
parent711c37076a954bb9a6109f0a150da369749ae0e8 (diff)
parentdbc5f8c39bdc2a6b16ef59125f9fa872e765b327 (diff)
downloadcpython-git-fccfb824e60ad5871f76d889159bd1ff4a16b81b.tar.gz
merge 3.3 (#17550)
-rw-r--r--Misc/NEWS2
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index e9261c5ccd..ed93a90af5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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
diff --git a/configure b/configure
index aefad26880..7d8a65526a 100755
--- a/configure
+++ b/configure
@@ -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])