From c94bd299a809ee0b8d3143163e6e7699e1773bef Mon Sep 17 00:00:00 2001 From: thakis Date: Fri, 8 Jan 2016 09:57:04 -0800 Subject: ios: Use 10.10 SDK for host binaries. The iOS build raised mac_sdk_min to 10.8 back when mac was using the 10.6 SDK. Now that mac is on the 10.10 SDK, it's no longer necessary to use a different SDK for host binaries on iOS. Hopefully all iOS bots have the 10.10 SDK installed. If any iOS bots fail to build with this, please revert and let me know which bots it failed on. BUG=none Review URL: https://codereview.chromium.org/1573493002 Cr-Commit-Position: refs/heads/master@{#368370} --- build/common.gypi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'build/common.gypi') diff --git a/build/common.gypi b/build/common.gypi index dbb7669..e8c7b16 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1943,18 +1943,16 @@ # based on mac_sdk_min will be bypassed entirely. 'conditions': [ ['OS=="ios"', { - 'mac_sdk_min%': '10.8', # The iOS build can use Xcode's clang, and that will complain # about -stdlib=libc++ if the deployment target is not at least # 10.7. 'mac_deployment_target%': '10.7', }, { # else OS!="ios" - 'mac_sdk_min%': '10.10', 'mac_deployment_target%': '10.6', }], ], + 'mac_sdk_min': '10.10', 'mac_sdk_path%': '', - }, 'mac_sdk_min': '<(mac_sdk_min)', -- cgit v1.1