Merged revisions 85422 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85422 | antoine.pitrou | 2010-10-13 19:01:10 +0200 (Wed, 13 Oct 2010) | 6 lines

  Followup to #9437: since LDFLAGS is now appended to LDSHARED in the Makefile,
  don't do in configure as well.

  Hopefully this will solve a Makefile parsing issue on the FreeBSD buildbots.
........

diff --git a/configure b/configure
index 69adabb1ce6659b2971b4abf03b3bb0cbe8cce34..b29fca12b2c7dbd38733194c15d0d87f3bf701a2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 86043 .
+# From configure.in Revision: 86076 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 2.7.
 #
@@ -7564,8 +7564,8 @@ then
                fi ;;
        OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
        Darwin/1.3*)
-               LDSHARED='$(CC) $(LDFLAGS) -bundle'
-               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+               LDSHARED='$(CC) -bundle'
+               LDCXXSHARED='$(CXX) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -7577,8 +7577,8 @@ then
                        LDCXXSHARED="$LDCXXSHARED -undefined suppress"
                fi ;;
        Darwin/1.4*|Darwin/5.*|Darwin/6.*)
-               LDSHARED='$(CC) $(LDFLAGS) -bundle'
-               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+               LDSHARED='$(CC) -bundle'
+               LDCXXSHARED='$(CXX) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -7599,12 +7599,12 @@ then
                        if test "${enable_universalsdk}"; then
                                LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
                        fi
-                       LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
-                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+                       LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
+                       LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
                        BLDSHARED="$LDSHARED"
                else
-                       LDSHARED='$(CC) $(LDFLAGS) -bundle'
-                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+                       LDSHARED='$(CC) -bundle'
+                       LDCXXSHARED='$(CXX) -bundle'
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals should be defined.
                                BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -7627,30 +7627,30 @@ then
        FreeBSD*)
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
-                       LDSHARED='$(CC) -shared ${LDFLAGS}'
-                       LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
                else
-                       LDSHARED="ld -Bshareable ${LDFLAGS}"
+                       LDSHARED="ld -Bshareable"
                fi;;
        OpenBSD*)
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
-                               LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
-                               LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
+                               LDSHARED='$(CC) -shared $(CCSHARED)'
+                               LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
                else
                                case `uname -r` in
                                [01].* | 2.[0-7] | 2.[0-7].*)
                                   LDSHARED="ld -Bshareable ${LDFLAGS}"
                                   ;;
                                *)
-                                  LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
-                                  LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
+                                  LDSHARED='$(CC) -shared $(CCSHARED)'
+                                  LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
                                   ;;
                                esac
                fi;;
        NetBSD*|DragonFly*)
-               LDSHARED="cc -shared ${LDFLAGS}"
-               LDCXXSHARED="c++ -shared ${LDFLAGS}";;
+               LDSHARED="cc -shared"
+               LDCXXSHARED="c++ -shared";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes" ; then
                        LDSHARED='$(CC) -shared'

diff --git a/configure.in b/configure.in
index a499a9b971935c41ced205f3a8fbaf7698de7328..a61eb4569c03d05dbeeef55d0f391228b5c6c598 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1790,8 +1790,8 @@ then
                fi ;;
        OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
        Darwin/1.3*)
-               LDSHARED='$(CC) $(LDFLAGS) -bundle'
-               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+               LDSHARED='$(CC) -bundle'
+               LDCXXSHARED='$(CXX) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -1803,8 +1803,8 @@ then
                        LDCXXSHARED="$LDCXXSHARED -undefined suppress"
                fi ;;
        Darwin/1.4*|Darwin/5.*|Darwin/6.*)
-               LDSHARED='$(CC) $(LDFLAGS) -bundle'
-               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+               LDSHARED='$(CC) -bundle'
+               LDCXXSHARED='$(CXX) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -1825,12 +1825,12 @@ then
                        if test "${enable_universalsdk}"; then
                                LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
                        fi
-                       LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
-                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+                       LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
+                       LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
                        BLDSHARED="$LDSHARED"
                else
-                       LDSHARED='$(CC) $(LDFLAGS) -bundle'
-                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
+                       LDSHARED='$(CC) -bundle'
+                       LDCXXSHARED='$(CXX) -bundle'
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals should be defined.
                                BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
@@ -1853,30 +1853,30 @@ then
        FreeBSD*)
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
-                       LDSHARED='$(CC) -shared ${LDFLAGS}'
-                       LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
                else
-                       LDSHARED="ld -Bshareable ${LDFLAGS}"
+                       LDSHARED="ld -Bshareable"
                fi;;
        OpenBSD*)
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
-                               LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
-                               LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
+                               LDSHARED='$(CC) -shared $(CCSHARED)'
+                               LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
                else
                                case `uname -r` in
                                [[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
                                   LDSHARED="ld -Bshareable ${LDFLAGS}"
                                   ;;
                                *)
-                                  LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
-                                  LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
+                                  LDSHARED='$(CC) -shared $(CCSHARED)'
+                                  LDCXXSHARED='$(CXX) -shared $(CCSHARED)'
                                   ;;
                                esac
                fi;;
        NetBSD*|DragonFly*)
-               LDSHARED="cc -shared ${LDFLAGS}"
-               LDCXXSHARED="c++ -shared ${LDFLAGS}";;
+               LDSHARED="cc -shared"
+               LDCXXSHARED="c++ -shared";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes" ; then
                        LDSHARED='$(CC) -shared'