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

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

Issue 2412353003: Remove direct references to hermetic mac toolchain. (Closed)
Patch Set: Remove unused import. Created 4 years, 2 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 | build/config/mac/rules.gni » ('j') | tools/clang/scripts/update.py » ('J')
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 138376261a83652e18bd03f7fda4c30da1c0b9bb..0fb5dd512721642148eafa96504e570bedd28af9 100644
--- a/build/config/mac/mac_sdk.gni
+++ b/build/config/mac/mac_sdk.gni
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
+import("//build/toolchain/toolchain.gni")
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453.
# We can drop the rtc_require_mac_10_7_deployment flag when Chromium
@@ -38,6 +39,12 @@ declare_args() {
_verify_sdk = is_chrome_branded && is_official_build && target_os != "ios"
find_sdk_args = [ "--print_sdk_path" ]
+if (!use_system_xcode) {
+ find_sdk_args += [
+ "--developer_dir",
+ hermetic_xcode_path,
+ ]
+}
if (_verify_sdk) {
find_sdk_args += [
"--verify",
@@ -58,8 +65,16 @@ if (mac_sdk_path == "") {
}
script_name = "//build/config/mac/sdk_info.py"
-_mac_sdk_result = exec_script(script_name, [ mac_sdk_name ], "scope")
-mac_sdk_build = _mac_sdk_result.sdk_build
+sdk_info_args = []
+if (!use_system_xcode) {
+ sdk_info_args += [
+ "--developer_dir",
+ hermetic_xcode_path,
+ ]
+}
+sdk_info_args += [ mac_sdk_name ]
+
+_mac_sdk_result = exec_script(script_name, sdk_info_args, "scope")
xcode_version = _mac_sdk_result.xcode_version
xcode_build = _mac_sdk_result.xcode_build
machine_os_build = _mac_sdk_result.machine_os_build
« no previous file with comments | « no previous file | build/config/mac/rules.gni » ('j') | tools/clang/scripts/update.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698