Change scons so OpenMP library is appended at end of linkage line with other

libraries (fixes a problem with statically linking OpenMP).
This commit is contained in:
Ken Hughes 2008-04-17 19:01:00 +00:00
parent 0ecf7a6f5b
commit a1689a5e9a
2 changed files with 2 additions and 1 deletions

@ -189,7 +189,6 @@ if env['WITH_BF_OPENMP'] == 1:
env['CPPFLAGS'].append('-openmp')
env['CXXFLAGS'].append('-openmp')
else:
env.Append(LINKFLAGS=['-lgomp'])
env['CCFLAGS'].append('-fopenmp')
env['CPPFLAGS'].append('-fopenmp')
env['CXXFLAGS'].append('-fopenmp')

@ -152,6 +152,8 @@ def setup_syslibs(lenv):
syslibs += Split(lenv['BF_GETTEXT_LIB'])
if lenv['WITH_BF_OPENAL']:
syslibs += Split(lenv['BF_OPENAL_LIB'])
if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc':
syslibs += ['gomp']
if lenv['WITH_BF_ICONV']:
syslibs += Split(lenv['BF_ICONV_LIB'])
if lenv['WITH_BF_OPENEXR']: