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.in | |
| 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.in')
| -rw-r--r-- | libjava/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 9daa03e9486..591624c66e3 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1051,6 +1051,8 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ $(nat_source_files) $(am__append_11) $(am__append_12) \ $(am__append_13) $(am__append_14) $(am__append_15) \ $(am__append_16) $(am__append_17) $(am__append_18) +@USING_DARWIN_CRT_FALSE@LIBJAVA_LDFLAGS_LIBMATH = -lm +@USING_DARWIN_CRT_TRUE@LIBJAVA_LDFLAGS_LIBMATH = nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) @@ -1101,7 +1103,8 @@ 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) $(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 \ |