Issue #1222585: Added LDCXXSHARED for C++ support

diff --git a/Makefile.pre.in b/Makefile.pre.in
index adccea189430e5c642729f36cb0dc5a18efd16dc..ad9fb2a4e959b28bce002837e4d9be6cba6aba21 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -107,6 +107,7 @@ LIBP=               $(LIBDIR)/python$(VERSION)
 SO=            @SO@
 LDSHARED=      @LDSHARED@
 BLDSHARED=     @BLDSHARED@
+LDCXXSHARED=   @LDCXXSHARED@
 DESTSHARED=    $(BINLIBDEST)/lib-dynload
 
 # Executable suffix (.exe on Windows and Mac OS X)

diff --git a/Misc/NEWS b/Misc/NEWS
index 657172f0c973c1cfe49907a9c04b515a546b14c3..29d9d401d127415ffbde3a4ccb4d5c8d28fd6c06 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.7 beta 1?
 Core and Builtins
 -----------------
 
+- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever.
+
 - Raise a TypeError when trying to delete a T_STRING_INPLACE struct member.
 
 - Issue #7994: Issue a PendingDeprecationWarning if object.__format__

diff --git a/configure.in b/configure.in
index e9bd94b5adb557987efe4d52203783634f768f95..bdc5b6c24f8457e575b42d65f7d04912ad5ad261 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1719,6 +1719,7 @@ esac
 # Set info about shared libraries.
 AC_SUBST(SO)
 AC_SUBST(LDSHARED)
+AC_SUBST(LDCXXSHARED)
 AC_SUBST(BLDSHARED)
 AC_SUBST(CCSHARED)
 AC_SUBST(LINKFORSHARED)
@@ -1771,36 +1772,47 @@ then
        IRIX/5*) LDSHARED="ld -shared";;
        IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
        SunOS/5*) 
-               if test "$GCC" = "yes"
-               then LDSHARED='$(CC) -shared'
-               else LDSHARED='$(CC) -G';
+               if test "$GCC" = "yes" ; then
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
+               else
+                       LDSHARED='$(CC) -G'
+                       LDCXXSHARED='$(CXX) -G'
                fi ;;
        hp*|HP*)
-               if test "$GCC" = "yes"
-               then LDSHARED='$(CC) -shared'
-               else LDSHARED='ld -b';
+               if test "$GCC" = "yes" ; then
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
+               else
+                       LDSHARED='ld -b'
                fi ;;
        OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
        Darwin/1.3*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
+               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework. Ignore undefined symbols, assuming they come from Python
                        LDSHARED="$LDSHARED -undefined suppress"
+                       LDCXXSHARED="$LDCXXSHARED -undefined suppress"
                fi ;;
        Darwin/1.4*|Darwin/5.*|Darwin/6.*)
                LDSHARED='$(CC) $(LDFLAGS) -bundle'
+               LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
                if test "$enable_framework" ; then
                        # Link against the framework. All externals should be defined.
                        BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                       LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                else
                        # No framework, use the Python app as bundle-loader
                        BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
                        LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+                       LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
                fi ;;
        Darwin/*)
                # Use -undefined dynamic_lookup whenever possible (10.3 and later).
@@ -1812,26 +1824,35 @@ then
                                LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
                        fi
                        LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
+                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle -undefined dynamic_lookup'
                        BLDSHARED="$LDSHARED"
                else
                        LDSHARED='$(CC) $(LDFLAGS) -bundle'
+                       LDCXXSHARED='$(CXX) $(LDFLAGS) -bundle'
                        if test "$enable_framework" ; then
                                # Link against the framework. All externals should be defined.
                                BLDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                                LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+                               LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
                        else
                                # No framework, use the Python app as bundle-loader
                                BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
                                LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
+                               LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
                        fi
                fi
                ;;
-       Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
-       BSD/OS*/4*) LDSHARED="gcc -shared";;
+       Linux*|GNU*|QNX*)
+               LDSHARED='$(CC) -shared'
+               LDCXXSHARED='$(CXX) -shared';;
+       BSD/OS*/4*)
+               LDSHARED="gcc -shared"
+               LDCXXSHARED="g++ -shared";;
        FreeBSD*)
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
                        LDSHARED='$(CC) -shared ${LDFLAGS}'
+                       LDCXXSHARED='$(CXX) -shared ${LDFLAGS}'
                else
                        LDSHARED="ld -Bshareable ${LDFLAGS}"
                fi;;
@@ -1839,6 +1860,7 @@ then
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
                                LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+                               LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
                else
                                case `uname -r` in
                                [[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
@@ -1846,22 +1868,35 @@ then
                                   ;;
                                *)
                                   LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
+                                  LDCXXSHARED='$(CXX) -shared $(CCSHARED) ${LDFLAGS}'
                                   ;;
                                esac
                fi;;
-       NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
+       NetBSD*|DragonFly*)
+               LDSHARED="cc -shared ${LDFLAGS}"
+               LDCXXSHARED="c++ -shared ${LDFLAGS}";;
        OpenUNIX*|UnixWare*)
-               if test "$GCC" = "yes"
-               then LDSHARED='$(CC) -shared'
-               else LDSHARED='$(CC) -G'
+               if test "$GCC" = "yes" ; then
+                       LDSHARED='$(CC) -shared'
+                       LDCXXSHARED='$(CXX) -shared'
+               else
+                       LDSHARED='$(CC) -G'
+                       LDCXXSHARED='$(CXX) -G'
                fi;;
-       SCO_SV*) LDSHARED='$(CC) -Wl,-G,-Bexport';;
-       CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
-       atheos*) LDSHARED="gcc -shared";;
+       SCO_SV*)
+               LDSHARED='$(CC) -Wl,-G,-Bexport'
+               LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
+       CYGWIN*)
+               LDSHARED="gcc -shared -Wl,--enable-auto-image-base"
+               LDCXXSHARED="g++ -shared -Wl,--enable-auto-image-base";;
+       atheos*)
+               LDSHARED="gcc -shared"
+               LDCXXSHARED="g++ -shared";;
        *)      LDSHARED="ld";;
        esac
 fi
 AC_MSG_RESULT($LDSHARED)
+LDCXXSHARED=${LDCXXSHARED-$LDSHARED}
 BLDSHARED=${BLDSHARED-$LDSHARED}
 # CCSHARED are the C *flags* used to create objects to go into a shared
 # library (module) -- this is only needed for a few systems