diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-09-27 06:49:33 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2009-09-27 06:49:33 +0000 |
| commit | c829a8884b52b57f9e4adea3078016ed338ecfa9 (patch) | |
| tree | 447040d312e28c4aba6b8805f1c6913013244950 | |
| parent | 5bfbb7f7357b6e176030379b474bdbff87157f2e (diff) | |
| download | gcc-c829a8884b52b57f9e4adea3078016ed338ecfa9.zip gcc-c829a8884b52b57f9e4adea3078016ed338ecfa9.tar.gz gcc-c829a8884b52b57f9e4adea3078016ed338ecfa9.tar.bz2 | |
Fix library dependencies for -Wl,--as-needed.
gcc/:
PR bootstrap/40928
* configure.ac: Use $LIBS for '-ldl', not $LDFLAGS.
* configure: Regenerate.
libjava/:
PR libgcj/38298
* Makefile.am (libgcj_tools_la_LIBADD): Add '-lm'.
* Makefile.in: Regenerate.
From-SVN: r152215
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 2 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 | ||||
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0bbadeb..ccad7ca 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-09-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR bootstrap/40928 + * configure.ac: Use $LIBS for '-ldl', not $LDFLAGS. + * configure: Regenerate. + 2009-09-26 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * doc/install.texi: Update minimum MPC version to 0.7. diff --git a/gcc/configure b/gcc/configure index ced17cd..dbd10a5 100755 --- a/gcc/configure +++ b/gcc/configure @@ -24952,7 +24952,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi # Check -ldl - LDFLAGS="$LDFLAGS -ldl" + LIBS="$LIBS -ldl" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ldl" >&5 $as_echo_n "checking for -ldl... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/gcc/configure.ac b/gcc/configure.ac index 3f0ff7d..96b3b5d 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -4228,7 +4228,7 @@ if test x"$enable_plugin" = x"yes"; then fi # Check -ldl - LDFLAGS="$LDFLAGS -ldl" + LIBS="$LIBS -ldl" AC_MSG_CHECKING([for -ldl]) AC_TRY_LINK( [#include <dlfcn.h>], diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e8ad3b3..0a6c902 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2009-09-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR libgcj/38298 + * Makefile.am (libgcj_tools_la_LIBADD): Add '-lm'. + * Makefile.in: Regenerate. + 2009-09-22 Dave Korn <dave.korn.cygwin@gmail.com> * configure.host (enable_libgcj_sublibs_default): New variable, diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e923fa3..ad4fca2 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -496,7 +496,7 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \ libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) -no-undefined -bindir $(bindir) -libgcj_tools_la_LIBADD = libgcj.la +libgcj_tools_la_LIBADD = libgcj.la -lm libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec if BUILD_SUBLIBS libgcj_tools_la_DEPENDENCIES += libgcj-noncore.la diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 83c4c60..8c09373 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1187,7 +1187,7 @@ libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) -no-undefined -bindir $(bindir) -libgcj_tools_la_LIBADD = libgcj.la +libgcj_tools_la_LIBADD = libgcj.la -lm libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22) libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS) libjvm_la_SOURCES = jni-libjvm.cc |