From d7b25c734e6835152451fbe2ff3b809c5006ad51 Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 12 Nov 2015 08:41:40 -0800 Subject: [PATCH] Target Mac bots at 10.7+libc++ to approximate Chrome's 10.6+libc++. 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 --- gyp/common_conditions.gypi | 5 +++-- gyp/tools.gyp | 10 ---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index e7edb2763f..b710462787 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -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 diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 969ea87453..74f2b2cda1 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -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', -- 2.34.1