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:
authorDaniel Genrich <daniel.genrich@gmx.net>2008-03-05 17:58:33 +0300
committerDaniel Genrich <daniel.genrich@gmx.net>2008-03-05 17:58:33 +0300
commit3a7b420ec66d2fa64814997f205f8d307fce8436 (patch)
tree74d9a01b847d0851f1927bb8b5eb4d107b48fee9 /SConstruct
parent2e030000d14a03a76a1eaa716483f8b57fcdc0af (diff)
Bugfix for wrong OpenMP flags when using icc (proposed by jensverwiebe via IRC)
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct14
1 files changed, 10 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index efb8ae6d219..3ee56f7cff1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -185,10 +185,16 @@ 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')
+ if env['CC'] == 'icc':
+ env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+ env['CCFLAGS'].append('-openmp')
+ 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')
#check for additional debug libnames