diff options
| author | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-18 08:51:57 +0000 |
|---|---|---|
| committer | iains <iains@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-18 08:51:57 +0000 |
| commit | d947fb63a6626f195d815d4360937718dedb6ac6 (patch) | |
| tree | 141951189d8c9f34c6def3888b707ca9f741dfdb /libjava/Makefile.am | |
| parent | 06df6b178d3f0777243244b847004e5c1292e3f0 (diff) | |
| download | gcc-d947fb63a6626f195d815d4360937718dedb6ac6.tar.gz | |
2010-08-18 Jack Howarth <howarth@bromo.med.uc.edu>
* libjava/configure.ac (THREADLIBS): Don't set on Darwin.
(THREADSPEC): Likwise.
* libjava/configure: Regenerate.
* libjava/Makefile.am: Define LIBJAVA_LDFLAGS_LIBMATH as
-lm only if USING_DARWIN_CRT undefined.
(libgcj_tools_la_LIBADD): Replace '-lm' with $(LIBJAVA_LDFLAGS_LIBMATH).
* libjava/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163329 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 7b67ed0e1e7..dcdf8273007 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -465,6 +465,9 @@ endif if USING_DARWIN_CRT libgcj_la_SOURCES += darwin.cc +LIBJAVA_LDFLAGS_LIBMATH = +else +LIBJAVA_LDFLAGS_LIBMATH = -lm endif if USING_POSIX_THREADS @@ -544,7 +547,9 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \ -fsource-filename=$(here)/classpath/tools/all-classes.lst libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) -lm + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) \ + $(LIBJAVA_LDFLAGS_LIBMATH) + libgcj_tools_la_LIBADD = libgcj.la libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec \ $(libgcj_tools_la_version_dep) |