[Bf-blender-cvs] [069adb8] master: SCons: Fix for missing avx and avx2 cycles kernels

[Sergey Sharybin]

Commit: 069adb8104fb088310b7cb4088414c9a997f7716
Author: Sergey Sharybin
Date:   Thu May 21 18:45:49 2015 +0500
Branches: master
https://developer.blender.org/rB069adb8104fb088310b7cb4088414c9a997f7716

SCons: Fix for missing avx and avx2 cycles kernels

SCons was checking for a particular compiler version to see whether compiler
flags are available or not, but compiler ID was only set on OSX.

Now it should be set on Linux as well.

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index c5e1d66..a32fff9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -470,6 +470,14 @@ if env['OURPLATFORM']=='darwin':
 ###################  End Automatic configuration for OSX   ##################
 #############################################################################
 
+if env['OURPLATFORM'] == 'linux' and not env['C_COMPILER_ID']:
+    command = ["%s"%env['CC'], "--version"]
+    line = btools.get_command_output(command)
+    if line.startswith('gcc'):
+        env['C_COMPILER_ID'] = 'gcc'
+    elif 'clang' in line[0]:
+        env['C_COMPILER_ID'] = 'clang'
+
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
                 env['CCFLAGS'].append('/openmp')