diff options
author | Ken Hughes <khughes@pacific.edu> | 2008-04-17 23:01:00 +0400 |
---|---|---|
committer | Ken Hughes <khughes@pacific.edu> | 2008-04-17 23:01:00 +0400 |
commit | a1689a5e9a86e1078e6665a38c26ef45c4a90048 (patch) | |
tree | e00f2dc95a7bd8b4d6261d1068a55cadca878e19 | |
parent | 0ecf7a6f5bce3d2f3291e61823a0fc295c153a98 (diff) |
Change scons so OpenMP library is appended at end of linkage line with other
libraries (fixes a problem with statically linking OpenMP).
-rw-r--r-- | SConstruct | 1 | ||||
-rw-r--r-- | tools/Blender.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index a42a7ce40a0..47914b8853d 100644 --- a/SConstruct +++ b/SConstruct @@ -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') diff --git a/tools/Blender.py b/tools/Blender.py index 967bf1fcd3c..30e9979cf9a 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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']: |