summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-14 15:18:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-14 15:18:25 (GMT)
commitab0a7527880841bd1a0beb5db6c82fdafde4b4e5 (patch)
tree23eb93e00412535040e4cbd7c0dd86d483eab328
parent847a4110ea99626b14a85da348c2f333ae2c54a5 (diff)
downloadcpython-ab0a7527880841bd1a0beb5db6c82fdafde4b4e5.zip
cpython-ab0a7527880841bd1a0beb5db6c82fdafde4b4e5.tar.gz
cpython-ab0a7527880841bd1a0beb5db6c82fdafde4b4e5.tar.bz2
Merged revisions 78962,78964 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78962 | benjamin.peterson | 2010-03-14 09:24:31 -0500 (Sun, 14 Mar 2010) | 1 line fix freebsd linking #7705 ........ r78964 | benjamin.peterson | 2010-03-14 10:06:14 -0500 (Sun, 14 Mar 2010) | 1 line fix quotes ........
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index ee3ff28..959979f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 78818 .
+# From configure.in Revision: 78821 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@@ -14728,7 +14728,7 @@ then
FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then
- LDSHARED="$CC -shared ${LDFLAGS}"
+ LDSHARED='$(CC) -shared ${LDFLAGS}'
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
diff --git a/configure.in b/configure.in
index 415a35f..de788fb 100644
--- a/configure.in
+++ b/configure.in
@@ -1720,7 +1720,7 @@ then
FreeBSD*)
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
then
- LDSHARED="$CC -shared ${LDFLAGS}"
+ LDSHARED='$(CC) -shared ${LDFLAGS}'
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;