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

Side by Side Diff: build/config/mac/mac_sdk.gni

Issue 136793020: Get the proper Mac SDK path for the GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/mac/find_sdk.py » ('j') | build/mac/find_sdk.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 declare_args() { 5 declare_args() {
6 # Minimum supported version of the Mac SDK. 6 # Minimum supported version of the Mac SDK.
7 mac_sdk_min = "10.6" 7 mac_sdk_min = "10.6"
8 8
9 # Path to a specific version of the Mac SDKJ, not including a backslash at 9 # Path to a specific version of the Mac SDKJ, not including a backslash at
10 # the end. If empty, the path to the lowest version greater than or equal to 10 # the end. If empty, the path to the lowest version greater than or equal to
11 # mac_sdk_min is used. 11 # mac_sdk_min is used.
12 mac_sdk_path = "" 12 mac_sdk_path = ""
13 } 13 }
14 14
15 find_sdk_args = [ "--print_sdk_path" ]
15 if (is_chrome_branded && is_official_build) { 16 if (is_chrome_branded && is_official_build) {
16 find_sdk_args = [ "--verify", mac_sdk_min "--sdk_path=" + mac_sdk_path ] 17 find_sdk_args += [ "--verify", mac_sdk_min "--sdk_path=" + mac_sdk_path ]
17 } else { 18 } else {
18 find_sdk_args = [ mac_sdk_min ] 19 find_sdk_args += [ mac_sdk_min ]
19 } 20 }
20 # Use "list lines" and take the first to get version string without a newline. 21 # The tool will print the SDK path on the first line, and the version on the
22 # second line.
21 find_sdk_lines = 23 find_sdk_lines =
22 exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines") 24 exec_script("//build/mac/find_sdk.py", find_sdk_args, "list lines")
23 mac_sdk_version = find_sdk_lines[0] 25 mac_sdk_version = find_sdk_lines[1]
24 if (mac_sdk_path == "") { 26 if (mac_sdk_path == "") {
25 mac_sdk_root = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.pl atform/Developer/SDKs/MacOSX" 27 # 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
26 mac_sdk_path = mac_sdk_root + mac_sdk_version + ".sdk" 28 # --print_sdk_path argument to find_sdk and instead just use the following
29 # two lines. This saves a process fork.
30 #mac_sdk_root = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p latform/Developer/SDKs/MacOSX"
31 #mac_sdk_path = mac_sdk_root + mac_sdk_version + ".sdk"
32 mac_sdk_path = find_sdk_lines[0]
27 } 33 }
OLDNEW
« no previous file with comments | « no previous file | build/mac/find_sdk.py » ('j') | build/mac/find_sdk.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698