diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 01:05:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-17 01:05:20 +0000 |
| commit | 21580a91c801373e2480ff027c490a3b56d1fa32 (patch) | |
| tree | f1e93b930030fc95c16c95ec68ef6f5d14167c4f /build/config | |
| parent | 918056e5e68dea9ca680c3969afd79dc4e8462dd (diff) | |
| download | chromium_src-21580a91c801373e2480ff027c490a3b56d1fa32.zip chromium_src-21580a91c801373e2480ff027c490a3b56d1fa32.tar.gz chromium_src-21580a91c801373e2480ff027c490a3b56d1fa32.tar.bz2 | |
Get the proper Mac SDK path for the GN build.
This gets the path from xcodebuild rather than hardcoding it in the .gn files.
R=thakis
BUG=
Review URL: https://codereview.chromium.org/136793020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config')
| -rw-r--r-- | build/config/mac/mac_sdk.gni | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/build/config/mac/mac_sdk.gni b/build/config/mac/mac_sdk.gni index 007e037..770a06e 100644 --- a/build/config/mac/mac_sdk.gni +++ b/build/config/mac/mac_sdk.gni @@ -12,16 +12,23 @@ 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) http://crbug.com/335325 when everybody moves to XCode 5 we + # can remove the --print_sdk_path argument to find_sdk and instead just use + # the following two lines to get the path. Although it looks longer here, it + # saves forking a process in find_sdk.py so will be faster. + #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] } |