aboutsummaryrefslogtreecommitdiff
path: root/libjava/Makefile.am
diff options
context:
space:
mode:
authorJack Howarth <howarth@bromo.med.uc.edu>2010-08-18 08:51:57 +0000
committerIain Sandoe <iains@gcc.gnu.org>2010-08-18 08:51:57 +0000
commit618d48304d0fd942c77c9172f929f8c15574dec3 (patch)
tree141951189d8c9f34c6def3888b707ca9f741dfdb /libjava/Makefile.am
parent029e79eb866ef889c1eb3b91d547263e7b8d1c60 (diff)
downloadgcc-618d48304d0fd942c77c9172f929f8c15574dec3.zip
gcc-618d48304d0fd942c77c9172f929f8c15574dec3.tar.gz
gcc-618d48304d0fd942c77c9172f929f8c15574dec3.tar.bz2
configure.ac (THREADLIBS): Don't set on Darwin.
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. From-SVN: r163329
Diffstat (limited to 'libjava/Makefile.am')
-rw-r--r--libjava/Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 7b67ed0..dcdf827 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)