Index: build/config/sysroot.gni |
diff --git a/build/config/linux/sysroot.gni b/build/config/sysroot.gni |
similarity index 71% |
rename from build/config/linux/sysroot.gni |
rename to build/config/sysroot.gni |
index 4d14915ecdebb6d8c3c7856199b9ea28647cffe0..9f8926d8f36704c562842a1e505c924e90cf4a05 100644 |
--- a/build/config/linux/sysroot.gni |
+++ b/build/config/sysroot.gni |
@@ -19,9 +19,17 @@ if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) { |
sysroot = "" |
} |
} else if (is_mac) { |
+ import("//build/config/mac/mac_sdk.gni") |
+ |
# Set which SDK to use. |
- # TODO(brettw) this needs to be configurable somehow. |
- sysroot = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" |
+ if (is_chrome_branded && is_official_build) { |
+ find_sdk_args = ["--verify", mac_sdk_min "--sdk_path=" + mac_sdk_path] |
+ } else { |
+ find_sdk_args = [mac_sdk_min] |
+ } |
+ mac_sdk_version = |
brettw
2014/01/08 06:52:02
I was thinking everything up to here inclusive wou
bbudge
2014/01/08 13:41:55
Done.
|
+ exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") |
+ sysroot = mac_sdk_path + "/MacOSX" + mac_sdk_version[0] + ".sdk" |
} else { |
sysroot = "" |
} |