build/gyp_environment.py - Issue 1840323002: Add mac toolchain script support to find_sdk script.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: build/gyp_environment.py

Issue 1840323002: Add mac toolchain script support to find_sdk script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Create SetToolchainEnvironment method Created 4 years, 8 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

« no previous file with comments | « no previous file | build/mac/find_sdk.py » ('j') | no next file with comments »

OLD	NEW
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 """	5 """

6 Sets up various automatic gyp environment variables. These are used by	6 Sets up various automatic gyp environment variables. These are used by

7 gyp_chromium and landmines.py which run at different stages of runhooks. To	7 gyp_chromium and landmines.py which run at different stages of runhooks. To

8 make sure settings are consistent between them, all setup should happen here.	8 make sure settings are consistent between them, all setup should happen here.

9 """	9 """

10	10

(...skipping 14 matching lines...) Expand all Loading...
25 # . set the env var only if it hasn't been set yet	25 # . set the env var only if it hasn't been set yet

26 # . chromium.gyp_env has been applied to os.environ at this point already	26 # . chromium.gyp_env has been applied to os.environ at this point already

27 if sys.platform.startswith(('linux', 'win', 'freebsd')) and \	27 if sys.platform.startswith(('linux', 'win', 'freebsd')) and \

28 not os.environ.get('GYP_GENERATORS'):	28 not os.environ.get('GYP_GENERATORS'):

29 os.environ['GYP_GENERATORS'] = 'ninja'	29 os.environ['GYP_GENERATORS'] = 'ninja'

30 elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \	30 elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \

31 not 'OS=ios' in os.environ.get('GYP_DEFINES', []):	31 not 'OS=ios' in os.environ.get('GYP_DEFINES', []):

32 os.environ['GYP_GENERATORS'] = 'ninja'	32 os.environ['GYP_GENERATORS'] = 'ninja'

33	33

34 vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()	34 vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()

35 mac_toolchain_dir = mac_toolchain.GetToolchainDirectory()	35 mac_toolchain.SetToolchainEnvironment()

36 if mac_toolchain_dir:

37 os.environ['DEVELOPER_DIR'] = mac_toolchain_dir

OLD	NEW