summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-01-02 19:38:30 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-01-02 19:38:30 (GMT)
commitf1cc81a97d7e4ce21a08506fda5b5b846e65ba54 (patch)
tree2115941d774fc9c3f4a1e99df7908f7aebb704d3
parentbeef5dcf77a32df66ddfc65cc750d550ba6728db (diff)
downloadcpython-f1cc81a97d7e4ce21a08506fda5b5b846e65ba54.zip
cpython-f1cc81a97d7e4ce21a08506fda5b5b846e65ba54.tar.gz
cpython-f1cc81a97d7e4ce21a08506fda5b5b846e65ba54.tar.bz2
Merged revisions 87639 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87639 | antoine.pitrou | 2011-01-02 20:34:03 +0100 (dim., 02 janv. 2011) | 4 lines Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD and DragonFly BSD. Patch by Nicolas Joly. ........
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS6
-rwxr-xr-xconfigure11
-rw-r--r--configure.in2
4 files changed, 13 insertions, 7 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 02a0724..433d9bf 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -393,6 +393,7 @@ Fredrik Johansson
Gregory K. Johnson
Simon Johnston
Thomas Jollans
+Nicolas Joly
Evan Jones
Jeremy Jones
Richard Jones
diff --git a/Misc/NEWS b/Misc/NEWS
index 340fc12..a352559 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -86,6 +86,12 @@ Extensions
- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY.
+Build
+-----
+
+- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
+ and DragonFly BSD. Patch by Nicolas Joly.
+
Tests
-----
diff --git a/configure b/configure
index b4823f9..f68057f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 86044 .
+# From configure.in Revision: 86752 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.1.
#
@@ -757,8 +757,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
# Initialize some variables set by options.
@@ -7564,7 +7563,7 @@ then
;;
esac
fi;;
- NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+ NetBSD*|DragonFly*) LDSHARED="$(CC) -shared ${LDFLAGS}";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'
@@ -13923,8 +13922,8 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
_ACEOF
diff --git a/configure.in b/configure.in
index 0ec5e11..c94ea6e 100644
--- a/configure.in
+++ b/configure.in
@@ -1814,7 +1814,7 @@ then
;;
esac
fi;;
- NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+ NetBSD*|DragonFly*) LDSHARED="$(CC) -shared ${LDFLAGS}";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'