Chromium Code Reviews| Index: build/config/mac/mac_sdk.gni |
| diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni |
| index 007e037f35a6450d06c08fe804529f7184686e97..28a9de6fb20ad74685cacc1763610e7fed53cac6 100644 |
| --- a/build/config/mac/mac_sdk.gni |
| +++ b/build/config/mac/mac_sdk.gni |
| @@ -12,16 +12,22 @@ declare_args() { |
| mac_sdk_path = "" |
| } |
| +find_sdk_args = [ "--print_sdk_path" ] |
| if (is_chrome_branded && is_official_build) { |
| - find_sdk_args = [ "--verify", mac_sdk_min "--sdk_path=" + mac_sdk_path ] |
| + find_sdk_args += [ "--verify", mac_sdk_min "--sdk_path=" + mac_sdk_path ] |
| } else { |
| - find_sdk_args = [ mac_sdk_min ] |
| + find_sdk_args += [ mac_sdk_min ] |
| } |
| -# Use "list lines" and take the first to get version string without a newline. |
| +# The tool will print the SDK path on the first line, and the version on the |
| +# second line. |
| find_sdk_lines = |
| exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") |
| -mac_sdk_version = find_sdk_lines[0] |
| +mac_sdk_version = find_sdk_lines[1] |
| if (mac_sdk_path == "") { |
| - mac_sdk_root = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" |
| - mac_sdk_path = mac_sdk_root + mac_sdk_version + ".sdk" |
| + # TODO(brettw) when everybody moves to XCode 5 we can remove the |
|
Nico
2014/01/16 22:52:58
Add a reference to just-filed http://crbug.com/335
|
| + # --print_sdk_path argument to find_sdk and instead just use the following |
| + # two lines. This saves a process fork. |
| + #mac_sdk_root = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" |
| + #mac_sdk_path = mac_sdk_root + mac_sdk_version + ".sdk" |
| + mac_sdk_path = find_sdk_lines[0] |
| } |