mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-30 00:41:14 +00:00
Fix thread testing
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@9343 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
57f1f0cb8d
commit
074d2a9c48
4 changed files with 16 additions and 7 deletions
|
@ -1,3 +1,12 @@
|
|||
2001-03-13 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in (objc_thread_lib): Correct test for threading
|
||||
on non GNU/Linux, no bsd systems - actually add -lthread to link
|
||||
line. Don't set -lthread when cross-compiling. Also add extra_LIBS
|
||||
to objc_thread_lib.
|
||||
* target.make (solaris/TARGET_SYSTEM_LIBS): Don't add posix4 (should
|
||||
be in objc_thread_lib if needed.
|
||||
|
||||
2001-03-10 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Version 0.9.2
|
||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -1870,7 +1870,7 @@ fi
|
|||
else
|
||||
LIBS="-lobjc $LIBS $extra_LIBS"
|
||||
if test "$cross_compiling" = yes; then
|
||||
objc_threaded="-lthread"
|
||||
objc_threaded=""
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1877 "configure"
|
||||
|
|
10
configure.in
10
configure.in
|
@ -303,7 +303,6 @@ esac
|
|||
saved_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -x objective-c"
|
||||
saved_LIBS="$LIBS"
|
||||
objc_thread_lib=""
|
||||
if test $host_os = linux-gnu; then
|
||||
LIBS="-lobjc -lpthread"
|
||||
AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpthread",
|
||||
|
@ -323,9 +322,10 @@ elif test "`echo $host_os|sed 's/[[0-9]].*//'|sed s/elf//`" = freebsd; then
|
|||
objc_threaded="", objc_threaded="-lpcthread")
|
||||
fi
|
||||
else
|
||||
LIBS="-lobjc $LIBS $extra_LIBS"
|
||||
AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lthread",
|
||||
objc_threaded="", objc_threaded="-lthread")
|
||||
LIBS="-lobjc $LIBS -lthread $extra_LIBS"
|
||||
AC_TRY_RUN([#include "config_thread.m"],
|
||||
objc_threaded="-lthread $extra_LIBS",
|
||||
objc_threaded="", objc_threaded="")
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
@ -334,7 +334,7 @@ if test x"$objc_threaded" = x""; then
|
|||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
fi
|
||||
ac_cv_objc_threaded=$objc_threaded
|
||||
ac_cv_objc_threaded="$objc_threaded"
|
||||
AC_SUBST(objc_threaded)
|
||||
AC_SUBST(ac_cv_objc_threaded)
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
|
|||
else
|
||||
INTERNAL_CFLAGS = -D_REENTRANT
|
||||
INTERNAL_OBJCFLAGS = -D_REENTRANT
|
||||
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket -lnsl -ldl -lm -lposix4
|
||||
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket -lnsl -ldl -lm
|
||||
endif
|
||||
endif
|
||||
ifeq ($(findstring irix, $(GNUSTEP_TARGET_OS)), irix)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue