diff --git a/SConstruct b/SConstruct
index 0a7fa2aec9e..550cc318a12 100644
--- a/SConstruct
+++ b/SConstruct
@@ -294,6 +294,9 @@ if env['OURPLATFORM']=='darwin':
         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:
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index 622712e962a..81f3a81bce5 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -348,7 +348,7 @@ else:
 
 CFLAGS = []
 CXXFLAGS = []
-CCFLAGS = ['-pipe','-funsigned-char','-ftemplate-depth=1024']
+CCFLAGS = ['-pipe','-funsigned-char']
 
 
 CPPFLAGS = list(ARCH_FLAGS)