Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConstruct1
-rw-r--r--tools/Blender.py2
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']: