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

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index e7edb27..b710462 100644 (file)
--- 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 969ea87..74f2b2c 100644 (file)
--- 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',