Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

client: only add the pthread libs if not linking for Android

This commit is contained in:
Rom Walton 2013-10-21 13:09:47 -04:00
parent 514a0106aa
commit 5a1d6c83fa
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/Makefile.am
View File

@ -28,7 +28,11 @@ boinccmd_SOURCES = boinc_cmd.cpp
boinccmd_DEPENDENCIES = $(LIBBOINC) boinccmd_DEPENDENCIES = $(LIBBOINC)
boinccmd_CPPFLAGS = $(AM_CPPFLAGS) boinccmd_CPPFLAGS = $(AM_CPPFLAGS)
boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib
boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS) if OS_ANDROID
boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS)
else
boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
endif
boinc_client_SOURCES = \ boinc_client_SOURCES = \
acct_mgr.cpp \ acct_mgr.cpp \
@ -80,7 +84,6 @@ boinc_client_SOURCES = \
rr_sim.cpp \ rr_sim.cpp \
sandbox.cpp \ sandbox.cpp \
scheduler_op.cpp \ scheduler_op.cpp \
thread.cpp \
time_stats.cpp \ time_stats.cpp \
whetstone.cpp \ whetstone.cpp \
work_fetch.cpp work_fetch.cpp
@ -92,7 +95,11 @@ boinc_client_LDFLAGS = $(AM_LDFLAGS) $(SSL_LDFLAGS) -L../lib
if OS_DARWIN if OS_DARWIN
boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
endif endif
boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS) if OS_ANDROID
boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS)
else
boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
endif
boinc_clientdir = $(bindir) boinc_clientdir = $(bindir)

2
configure.ac
View File

@ -780,6 +780,8 @@ AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
dnl or OS2 dnl or OS2
AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null]) AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null])
AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null]) AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
dnl Android
AM_CONDITIONAL(OS_ANDROID, [echo $host_alias | grep '^android' > /dev/null])
dnl Whether to build fcgi components dnl Whether to build fcgi components
AM_CONDITIONAL(ENABLE_FCGI,[test "${enable_fcgi}" = yes]) AM_CONDITIONAL(ENABLE_FCGI,[test "${enable_fcgi}" = yes])