forked from bartvdbraak/blender
OSX/Scons/clang: restrict the ftemplate fix to clang only
This commit is contained in:
parent
0f81ea0db9
commit
97e823488c
@ -294,6 +294,9 @@ if env['OURPLATFORM']=='darwin':
|
|||||||
print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
|
print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
|
||||||
else:
|
else:
|
||||||
print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
|
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
|
# for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
|
||||||
# necessary header file lives here when installed:
|
# necessary header file lives here when installed:
|
||||||
|
@ -348,7 +348,7 @@ else:
|
|||||||
|
|
||||||
CFLAGS = []
|
CFLAGS = []
|
||||||
CXXFLAGS = []
|
CXXFLAGS = []
|
||||||
CCFLAGS = ['-pipe','-funsigned-char','-ftemplate-depth=1024']
|
CCFLAGS = ['-pipe','-funsigned-char']
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS = list(ARCH_FLAGS)
|
CPPFLAGS = list(ARCH_FLAGS)
|
||||||
|
Loading…
Reference in New Issue
Block a user