don't use version script under cygwin/mingw32, it's useless and breaks the link after latest autoconf-2.60-related bakefile 0.2.1 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-09 12:03:54 +00:00
parent ab3165fb0d
commit 077c78808f
3 changed files with 331 additions and 324 deletions

View File

@@ -535,22 +535,19 @@ dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
case "${host}" in
*-*-cygwin* | *-*-mingw* )
dnl although ld does support version script option on these
dnl platforms, it doesn't make much sense to use it under Win32
dnl and, moreover, this breaks linking because of a bug in handling
dnl paths in -Wl,--version-script,path option (if we ever do need
dnl to use it for cygwin/mingw32, keep in mind that replacing last
dnl comma with the equal sign works) so
dnl simply disable it
found_versioning=no
;;
dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
dnl in the script.
dnl dnl Check for known non-gcc cases:
dnl case "${host}" in
dnl *-*-solaris2* )
dnl if test "x$GCC" != "xyes" ; then
dnl LDFLAGS_VERSIONING="-M $1"
dnl found_versioning=yes
dnl fi
dnl ;;
dnl esac
dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
if test $found_versioning = no ; then
*)
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
@@ -606,10 +603,12 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
rm -f conftest1.output conftest2.output conftest3.output
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
fi
;;
esac
])

10
configure vendored
View File

@@ -34012,10 +34012,12 @@ fi
if test "$wxUSE_SHARED" = "yes"; then
case "${host}" in
*-*-cygwin* | *-*-mingw* )
found_versioning=no
;;
if test $found_versioning = no ; then
*)
echo "$as_me:$LINENO: checking if the linker accepts --version-script" >&5
echo $ECHO_N "checking if the linker accepts --version-script... $ECHO_C" >&6
if test "${wx_cv_version_script+set}" = set; then
@@ -34087,10 +34089,12 @@ else
fi
echo "$as_me:$LINENO: result: $wx_cv_version_script" >&5
echo "${ECHO_T}$wx_cv_version_script" >&6
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,\$(wx_top_builddir)/version-script"
fi
fi
;;
esac
case "${host}" in

View File

@@ -82,6 +82,10 @@ All:
- wxArrayString::Alloc() now works as reserve() and doesn't clear array contents
wxMSW:
- Fixed version script problems when using configure with cygwin/mingw32
2.7.2
-----