[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60001] trunk/blender: OSX/Scons/clang: restrict the ftemplate fix to clang only

[jens verwiebe]

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

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-09-10 12:22:21 UTC (rev 60000)
+++ trunk/blender/SConstruct	2013-09-10 12:31:21 UTC (rev 60001)
@@ -294,6 +294,9 @@
         print  B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
     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
 
     # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
     # necessary header file lives here when installed:

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2013-09-10 12:22:21 UTC (rev 60000)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-09-10 12:31:21 UTC (rev 60001)
@@ -348,7 +348,7 @@
 
 CFLAGS = []
 CXXFLAGS = []
-CCFLAGS = ['-pipe','-funsigned-char','-ftemplate-depth=1024']
+CCFLAGS = ['-pipe','-funsigned-char']
 
 
 CPPFLAGS = list(ARCH_FLAGS)