AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Target Mac bots at 10.7+libc++ to approximate Chrome's 10.6+libc++.

Browse Source 
This is necessary if we want to start using C++11 library features.

Chrome's got their own custom libc++-for-10.6.
This is a somewhat lazy approximation of that.

Chrome should still guard us from using 10.7-specific features
until 10.6-10.8 all go away.

BUG=skia:

Review URL: https://codereview.chromium.org/1437173002
This commit is contained in:
mtklein 2015-11-12 08:41:40 -08:00 committed by Commit bot
parent 95105938da
commit d7b25c734e
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gyp/common_conditions.gypi
View File

@ -388,7 +388,7 @@
'<@(skia_for_android_framework_defines)',
],
}],
[ 'skia_use_sdl == 1',
{
'defines': [ 'SK_USE_SDL' ],
@ -496,11 +496,12 @@
[ 'skia_arch_type == "x86"', { 'ARCHS': ['i386'] }],
[ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
[ 'skia_osx_deployment_target==""', {
'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld.
'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld.
}, {
'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
}],
],
'CLANG_CXX_LIBRARY': 'libc++',
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti

10
gyp/tools.gyp
View File

@ -157,16 +157,6 @@
'dependencies': [
'skia_lib.gyp:skia_lib',
],
'xcode_settings': {
'conditions': [
[ 'skia_osx_deployment_target==""', {
'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld.
}, {
'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
}],
],
'CLANG_CXX_LIBRARY': 'libc++',
},
},
{
'target_name': 'skpdiff',