Skip to content
Snippets Groups Projects
Commit c83d96e3 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

compile on MacOS X by default also with pthreads, like on Linux.

git-svn-id: http://root.cern.ch/svn/root/trunk@8198 27541ba8-7e3a-0410-8455-c3a389f83636
parent 4c628cda
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,8 @@ SOFLAGS = $(OPT) -dynamiclib -flat_namespace -undefined suppress \
SOEXT = dylib
# System libraries:
SYSLIBS = -lm $(EXTRA_LDFLAGS) $(FINK_LDFLAGS) -ldl
SYSLIBS = -lm $(EXTRA_LDFLAGS) $(FINK_LDFLAGS) $(OSTHREADLIBDIR) \
$(OSTHREADLIB) -ldl
XLIBS = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lX11
CILIBS = -lm $(EXTRA_LDFLAGS) $(FINK_LDFLAGS) -ldl
......
......@@ -270,6 +270,12 @@ macosx)
expl2="-u _G__cpp_setup_initializerG__G3D"
auxlibs="$expl1 $expl2 -lm `[ -d ${finkdir}/lib ] && echo -L${finkdir}/lib` -ldl"
auxglibs=${auxlibs}
for f in $features ; do
if test "x$f" = "xthread" ; then
auxcflags="-D_REENTRANT $auxcflags"
auxlibs="-lpthread $auxlibs"
fi
done
;;
macosxxlc)
# MacOS X with IBM xl compiler and possible fink (fink.sf.net)
......
......@@ -887,7 +887,7 @@ fi
# Check for posix thread library
#
case $platform in
linux|linuxdeb|linuxicc|linuxia64*|linuxx8664*|win32gcc)
linux|linuxdeb|linuxicc|linuxia64*|linuxx8664*|win32gcc|macosx)
if test "x$enable_thread" = "x"; then
enable_thread="yes"
fi
......
/* @(#)root/thread:$Name: $:$Id: PosixThreadInc.h,v 1.4 2000/12/11 16:16:19 rdm Exp $ */
/* @(#)root/thread:$Name: $:$Id: PosixThreadInc.h,v 1.5 2001/04/03 10:40:24 rdm Exp $ */
/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
......@@ -32,7 +32,8 @@
#include <stdlib.h>
#include <time.h>
#if defined(R__LINUX) || defined(R__SOLARIS) || defined(R__ALPHA)
#if defined(R__LINUX) || defined(R__SOLARIS) || defined(R__ALPHA) || \
defined(R__MACOSX)
#define PthreadDraftVersion 10
#elif defined(R__HPUX) || defined(R__AIX)
#define PthreadDraftVersion 4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment