always return just "$CXX -o" from wx-config --ld instead of returning the

command needed to link a shared library (if this is really needed, we should
add another --shared-ld option for this) as it isn't suitable for linking the
user applications


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-20 15:59:05 +00:00
parent c0030ca789
commit 99d4fdfdcc
3 changed files with 4 additions and 31 deletions

17
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 49043 2007-10-04 15:59:09Z MW . # From configure.in Id: configure.in 49200 2007-10-17 17:55:25Z VZ .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
# #
@@ -1003,7 +1003,6 @@ WXCONFIG_LIBS
WXCONFIG_RPATH WXCONFIG_RPATH
WXCONFIG_LDFLAGS_GUI WXCONFIG_LDFLAGS_GUI
WXCONFIG_RESFLAGS WXCONFIG_RESFLAGS
EXE_LINKER
GUIDIST GUIDIST
DISTDIR DISTDIR
SAMPLES_SUBDIRS SAMPLES_SUBDIRS
@@ -52988,10 +52987,6 @@ if test "$wxUSE_MAC" = 1 ; then
fi fi
if test "$wxUSE_SHARED" = "yes"; then if test "$wxUSE_SHARED" = "yes"; then
sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
case "${host}" in case "${host}" in
*-pc-os2_emx | *-pc-os2-emx ) *-pc-os2_emx | *-pc-os2-emx )
SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
@@ -53000,10 +52995,6 @@ if test "$wxUSE_SHARED" = "yes"; then
cp -p ${srcdir}/src/os2/dllar.sh . cp -p ${srcdir}/src/os2/dllar.sh .
;; ;;
esac esac
else
EXE_LINKER="$CXX -o"
fi fi
if test "$wxUSE_OMF" = "yes"; then if test "$wxUSE_OMF" = "yes"; then
case "${host}" in case "${host}" in
@@ -53098,7 +53089,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -54487,7 +54477,7 @@ WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
EXE_LINKER!$EXE_LINKER$ac_delim GUIDIST!$GUIDIST$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54529,7 +54519,6 @@ _ACEOF
ac_delim='%!_!# ' ac_delim='%!_!# '
for ac_last_try in false false false false false :; do for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF cat >conf$$subs.sed <<_ACEOF
GUIDIST!$GUIDIST$ac_delim
DISTDIR!$DISTDIR$ac_delim DISTDIR!$DISTDIR$ac_delim
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
LDFLAGS_GL!$LDFLAGS_GL$ac_delim LDFLAGS_GL!$LDFLAGS_GL$ac_delim
@@ -54551,7 +54540,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

View File

@@ -7703,16 +7703,6 @@ if test "$wxUSE_MAC" = 1 ; then
fi fi
if test "$wxUSE_SHARED" = "yes"; then if test "$wxUSE_SHARED" = "yes"; then
dnl We get the shared build linker from bakefile, since it
dnl moved all the logic for this out of this file and into
dnl its own macro. But it can't decide on whether to return
dnl us $(VAR), ${VAR}, or the present expansion of VAR.
dnl So normalise and expand everything here now, because its
dnl not going to change inside wx-config anyway.
sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
dnl Need addtional flag on OS/2, so override bakefiles value dnl Need addtional flag on OS/2, so override bakefiles value
dnl (there currently is no suitable variable to which the dnl (there currently is no suitable variable to which the
dnl missing flags could be added, AFAICS. SN, 18.12.2004. ) dnl missing flags could be added, AFAICS. SN, 18.12.2004. )
@@ -7724,11 +7714,6 @@ if test "$wxUSE_SHARED" = "yes"; then
cp -p ${srcdir}/src/os2/dllar.sh . cp -p ${srcdir}/src/os2/dllar.sh .
;; ;;
esac esac
else
dnl No bakefile support for static builds, but this should be ok for most.
EXE_LINKER="$CXX -o"
fi fi
if test "$wxUSE_OMF" = "yes"; then if test "$wxUSE_OMF" = "yes"; then
case "${host}" in case "${host}" in
@@ -7837,7 +7822,6 @@ AC_SUBST(WXCONFIG_LIBS)
AC_SUBST(WXCONFIG_RPATH) AC_SUBST(WXCONFIG_RPATH)
AC_SUBST(WXCONFIG_LDFLAGS_GUI) AC_SUBST(WXCONFIG_LDFLAGS_GUI)
AC_SUBST(WXCONFIG_RESFLAGS) AC_SUBST(WXCONFIG_RESFLAGS)
AC_SUBST(EXE_LINKER)
dnl distribution vars dnl distribution vars
AC_SUBST(GUIDIST) AC_SUBST(GUIDIST)

View File

@@ -893,7 +893,7 @@ bindir="@bindir@"
[ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@" [ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@"
[ -z "$output_option_cc" ] || echo "@CC@" [ -z "$output_option_cc" ] || echo "@CC@"
[ -z "$output_option_cxx" ] || echo "@CXX@" [ -z "$output_option_cxx" ] || echo "@CXX@"
[ -z "$output_option_ld" ] || echo "@EXE_LINKER@" [ -z "$output_option_ld" ] || echo "@CXX@ -o"
[ -z "$flag_option_selected_config" ] || echo "$this_config" [ -z "$flag_option_selected_config" ] || echo "$this_config"