diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-10-12 02:37:24 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-10-12 02:37:24 +0400 |
| commit | c742bc266aa133bd5f230930ccd11c6cf954d939 (patch) | |
| tree | 139bba2f3100c77f639e4b21f6ccf00db5a80345 /SConstruct | |
| parent | 356de1053472bcf7c93fa3dd62a5ae02844573bd (diff) | |
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
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index f9fa289a2b0..14ddf027498 100644 --- a/SConstruct +++ b/SConstruct @@ -296,7 +296,7 @@ if env['OURPLATFORM']=='darwin': 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 |