Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2394)

Unified Diff: build/config/mac/mac_sdk.gni

Issue 2225203003: [iOS] Fix compilation of official build with Xcode 8. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/mac/mac_sdk.gni
diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni
index eb0fdda61492d095fc13f6586316e4b11162610f..2d3b4af19e115a2936232c46d8b46d470325704d 100644
--- a/build/config/mac/mac_sdk.gni
+++ b/build/config/mac/mac_sdk.gni
@@ -25,8 +25,11 @@ declare_args() {
mac_sdk_name = "macosx"
}
+_verify_sdk = is_chrome_branded && is_official_build &&
+ current_toolchain != host_toolchain
Dirk Pranke 2016/08/08 23:15:06 I know we discussed this a bit back and forth over
sdefresne 2016/08/08 23:21:27 The issue is that Chrome on iOS wants to soon requ
Dirk Pranke 2016/08/08 23:36:28 Change to current_toolchain == default_toolchain,
+
find_sdk_args = [ "--print_sdk_path" ]
-if (is_chrome_branded && is_official_build) {
+if (_verify_sdk) {
find_sdk_args += [
"--verify",
mac_sdk_min,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698