[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60006] trunk/blender/SConstruct: OSX/ Scons/clang: more restrict the ftemplate fix to clang bundled with xcode 5 only

jens verwiebe info at jensverwiebe.de
Tue Sep 10 14:55:36 CEST 2013


Revision: 60006
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60006
Author:   jensverwiebe
Date:     2013-09-10 12:55:36 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
OSX/Scons/clang: more restrict the ftemplate fix to clang bundled with xcode 5 only

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

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-09-10 12:48:08 UTC (rev 60005)
+++ trunk/blender/SConstruct	2013-09-10 12:55:36 UTC (rev 60006)
@@ -295,8 +295,8 @@
     else:
         print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
 		
-    if env['CXX'].startswith('clang'):
-        env['CCFLAGS'].append('-ftemplate-depth=1024') # would break other gcc or llvm-gcc
+    if env['CXX'].startswith('clang') and env['XCODE_CUR_VER'] >= '5':
+        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
     # necessary header file lives here when installed:




More information about the Bf-blender-cvs mailing list