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

libraries (fixes a problem with statically linking OpenMP).

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')

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']: