diff options
| author | davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-21 19:41:37 +0000 |
|---|---|---|
| committer | davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-21 19:41:37 +0000 |
| commit | 7525020730265abd1e07fcc07d0e707a5a140825 (patch) | |
| tree | 3802590e4709444b1219175a10f94cc33e72acb9 /libjava/configure.host | |
| parent | e43d82e2fc8667da0839b901a6539d6f73fd99f7 (diff) | |
| download | gcc-7525020730265abd1e07fcc07d0e707a5a140825.tar.gz | |
PR target/42811
* libjava/configure.ac (DLLTOOL): Call AC_CHECK_TOOL.
(libgcj_sublib_core_extra_deps): New host-dependent configure var.
(LIBGCJ_SUBLIB_CORE_EXTRA_DEPS): AC_SUBST it.
* libjava/configure.host (libgcj_sublib_core_extra_deps): Define
appropriately on Cygwin and MinGW.
(libgcj_sublib_core_extra_deps): Add libgcj-noncore-dummy import
stub library on Cygwin and MinGW.
* libjava/Makefile.am (LIBJAVA_CORE_EXTRA): Import AC_SUBST'd
LIBGCJ_SUBLIB_CORE_EXTRA_DEPS if building sublibs, else define empty.
(libgcj_la_DEPENDENCIES): Use it.
(DLL_VERSION): New makefile macro.
(libgcj-noncore-dummy.dll.a): New build rule for dummy import stub
library.
(libgcj_noncore_la_LIBADD): Trim superfluous convenience libs.
(AM_MAKEFLAGS): Add DLLTOOL recursive propagation.
* libjava/libgcj-noncore-dummy.def: New file.
* libjava/Makefile.in: Regenerate.
* libjava/include/Makefile.in: Likewise.
* libjava/testsuite/Makefile.in: Likewise.
* libjava/configure: Likewise.
* libjava/gcj/Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157606 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.host')
| -rw-r--r-- | libjava/configure.host | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/configure.host b/libjava/configure.host index 36039b5fc4a..460ef2fab07 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -18,7 +18,8 @@ # libgcj_cflags Special CFLAGS to use when building # libgcj_cxxflags Special CXXFLAGS to use when building # libgcj_javaflags Special JAVAFLAGS to use when building -# libgcj_sublib_ltflags Special Libtool flags to use when building. +# libgcj_sublib_ltflags Special Libtool flags to use when building sublibs +# libgcj_sublib_core_extra_deps Extra dependencies to add to core sublib # libgcj_interpreter If the bytecode interpreter supports this platform. # enable_java_net_default If java.net native code should be enabled by # default. @@ -43,6 +44,7 @@ libgcj_cflags= libgcj_cxxflags= libgcj_javaflags= libgcj_sublib_ltflags= +libgcj_sublib_core_extra_deps= libgcj_interpreter= enable_java_net_default=yes enable_hash_synchronization_default=no @@ -351,7 +353,9 @@ case "${host}" in BACKTRACESPEC= # Win32 DLLs are limited to 64k exported symbols each. enable_libgcj_sublibs_default=yes - libgcj_sublib_ltflags='-no-undefined -bindir $(bindir)' + libgcj_sublib_ltflags='-no-undefined -bindir $(bindir) \ + -Wl,-u,__ZN3org4ietf4jgss10GSSManagerC1Ev,-L..,-lgcj-noncore-dummy' + libgcj_sublib_core_extra_deps=libgcj-noncore-dummy.dll.a ;; esac |