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/configure.ac | |
parent | 06df6b178d3f0777243244b847004e5c1292e3f0 (diff) | |
download | ppe42-gcc-d947fb63a6626f195d815d4360937718dedb6ac6.tar.gz ppe42-gcc-d947fb63a6626f195d815d4360937718dedb6ac6.zip |
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/configure.ac')
-rw-r--r-- | libjava/configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libjava/configure.ac b/libjava/configure.ac index 125e9ce9b46..685cb725575 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1077,6 +1077,10 @@ case "$THREADS" in THREADLIBS='-lpthread -lthread' THREADSPEC='-lpthread -lthread' ;; + *-*-darwin*) + # Don't set THREADLIBS or THREADSPEC as Darwin already + # provides pthread via libSystem. + ;; *) THREADLIBS=-lpthread THREADSPEC=-lpthread @@ -1445,6 +1449,8 @@ else # libgcj.spec is used, so override here SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}" ;; + *-*-darwin*) + ;; *) AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl") ;; |