[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60691] trunk/blender/SConstruct: OSX/ scons: change again conditional for ftemplate, it can be ambigous with xcode5, cause there is still gcc and llvm-gcc symlinks to clang, so env['CXX'] is bad test then

[jens verwiebe]

Revision: 60691
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60691
Author:   jensverwiebe
Date:     2013-10-11 22:37:24 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
OSX/scons: change again conditional for ftemplate, it can be ambigous with xcode5, cause there is still gcc and llvm-gcc symlinks to clang, so env['CXX'] is bad test then

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-10-11 21:37:25 UTC (rev 60690)
+++ trunk/blender/SConstruct	2013-10-11 22:37:24 UTC (rev 60691)
@@ -296,7 +296,7 @@
     else:
         print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
 		
-    if env['CXX'].startswith('clang') and env['XCODE_CUR_VER'] >= '5':
+    if env['XCODE_CUR_VER'] >= '5' and not (env['CXX'][:-2].endswith('4.6') or env['CXX'][:-2].endswith('4.8')):
         env['CCFLAGS'].append('-ftemplate-depth=1024') # only valid for clang bundled with xcode 5
 
     # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion