diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-15 21:39:18 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-15 21:39:18 +0000 |
| commit | 6a18079de8a39cf8438d60e51b3de2cd3a7edf00 (patch) | |
| tree | 7bb9064adc3d6bb8e50c5618dbda883d66a77002 /gyp | |
| parent | 389fb7fcd44d1addec58e3c4d5bf3f5a2dcd47bc (diff) | |
Use MACOSX_DEPLOYMENT_TARGET instead of SDKROOT.
MACOSX_DEPLOYMENT_TARGET is the minimum unconditionally supported OS,
which should just be 10.6 for us until Chrome changes. SDKROOT is the
maximum conditionally supported OS, which defaults sanely to whatever's
the latest SDK the machine has, so we don't need to mention it.
BUG=skia:
R=bungeman@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/137793010
git-svn-id: http://skia.googlecode.com/svn/trunk@13102 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 83bc5610cc..f3caddccfe 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -300,9 +300,6 @@ [ 'skia_os == "mac"', { - 'variables': { - 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', - }, 'defines': [ 'SK_BUILD_FOR_MAC', ], @@ -324,14 +321,7 @@ '-Wall', '-Wextra', '-Wno-unused-parameter', - ], - }, - }], -# This old compiler is really bad at figuring out when things are uninitialized, so ignore it. - [ '<(mac_sdk)==10.6', { - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': [ - '-Wno-uninitialized', + '-Wno-uninitialized', # Disabled because we think GCC 4.2 is bad at this. ], }, }], @@ -358,13 +348,7 @@ }, 'xcode_settings': { 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', - 'conditions': [ - [ 'skia_osx_sdkroot==""', { - 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot - }, { - 'SDKROOT': '<(skia_osx_sdkroot)', # -isysroot - }], - ], + 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in environment to ld. # trying to get this to work, but it needs clang I think... # 'WARNING_CFLAGS': '-Wexit-time-destructors', 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', |