sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shuffle addition of 'pthreads' flag so it is added before configure check

Browse source
This commit is contained in:
Dane Springmeyer 2010-10-12 05:34:41 +00:00
parent b498f858c5
commit 977ec6c498
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -893,6 +893,13 @@ if not preconfigured:
if env['THREADING'] == 'multi': if env['THREADING'] == 'multi':
BOOST_LIBSHEADERS.append(['thread', 'boost/thread/mutex.hpp', True]) BOOST_LIBSHEADERS.append(['thread', 'boost/thread/mutex.hpp', True])
# on solaris the configure checks for boost_thread
# require the -pthreads flag to be able to check for
# threading support, so we add as a global library instead
# of attaching to cxxflags after configure
if env['PLATFORM'] == 'SunOS':
env.Append(LIBS = '-pthreads')
# if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests # if requested, sort LIBPATH and CPPPATH before running CheckLibWithHeader tests
if env['PRIORITIZE_LINKING']: if env['PRIORITIZE_LINKING']:
@ -1060,8 +1067,6 @@ if not preconfigured:
# but will retain logic for future use # but will retain logic for future use
#if platform.mac_ver()[0].startswith('10.5'): #if platform.mac_ver()[0].startswith('10.5'):
# common_cxx_flags += '-DOSX_LEOPARD ' # common_cxx_flags += '-DOSX_LEOPARD '
elif env['PLATFORM'] == 'SunOS':
pthread = '-pthreads'
else: else:
pthread = '-pthread' pthread = '-pthread'