SHARED_LD must be CXX, not CC, otherwise we get unresolved
externals (at least with gcc3) if app binary wasn't linked with CXX. This may happen for instance when dynamically loading wxPython module. (Let's change it for all platforms, not only Linux, and see what happens.) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
ff292c7b5b
commit
6b076b4034
14
configure
vendored
14
configure
vendored
@ -10870,7 +10870,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
case "${host}" in
|
||||
*-hp-hpux* )
|
||||
if test "$GCC" = yes ; then
|
||||
SHARED_LD="${CC} -shared -fPIC -o"
|
||||
SHARED_LD="${CXX} -shared -fPIC -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
else
|
||||
LDFLAGS="-L/usr/lib"
|
||||
@ -10889,7 +10889,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
|
||||
*-*-linux* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
if test "$wxUSE_BURNT_NAME" = "yes" ; then
|
||||
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
|
||||
@ -10906,7 +10906,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
*-*-irix5* | *-*-irix6* )
|
||||
if test "$GCC" = yes ; then
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
else
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
@ -10921,7 +10921,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
*-*-solaris2* )
|
||||
if test "$GCC" = yes ; then
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
|
||||
@ -10938,13 +10938,13 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
fi
|
||||
;;
|
||||
*-*-sunos4* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
;;
|
||||
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
|
||||
@ -10992,7 +10992,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
WX_ALL="CREATE_LINKS"
|
||||
;;
|
||||
*-*-sysv5* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
|
14
configure.in
14
configure.in
@ -2163,7 +2163,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
case "${host}" in
|
||||
*-hp-hpux* )
|
||||
if test "$GCC" = yes ; then
|
||||
SHARED_LD="${CC} -shared -fPIC -o"
|
||||
SHARED_LD="${CXX} -shared -fPIC -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
else
|
||||
dnl no idea why it wants it, but it does
|
||||
@ -2184,7 +2184,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
|
||||
dnl in fact, these settings are for any platform using gcc
|
||||
*-*-linux* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
if test "$wxUSE_BURNT_NAME" = "yes" ; then
|
||||
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
|
||||
@ -2202,7 +2202,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
*-*-irix5* | *-*-irix6* )
|
||||
if test "$GCC" = yes ; then
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
else
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
@ -2217,7 +2217,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
;;
|
||||
*-*-solaris2* )
|
||||
if test "$GCC" = yes ; then
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
|
||||
dnl newer versions of gcc need -isystem to compile X headers on
|
||||
@ -2236,13 +2236,13 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
fi
|
||||
;;
|
||||
*-*-sunos4* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
;;
|
||||
*-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
|
||||
@ -2293,7 +2293,7 @@ if test "$wxUSE_SHARED" = "yes"; then
|
||||
WX_ALL="CREATE_LINKS"
|
||||
;;
|
||||
*-*-sysv5* )
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
WX_ALL="CREATE_LINKS"
|
||||
|
Loading…
Reference in New Issue
Block a user