Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Respect default goma path on Windows #7643

Merged
merged 3 commits into from
Jan 30, 2019
Merged

Respect default goma path on Windows #7643

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afd4728
Respect default goma path on Windows
liyuqian Jan 30, 2019
170af2c
Use os.path.join
liyuqian Jan 30, 2019
a227dce
Better comment
liyuqian Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tools/gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,11 @@ def to_gn_args(args):

goma_dir = os.environ.get('GOMA_DIR')
goma_home_dir = os.path.join(os.getenv('HOME', ''), 'goma')

# GOMA has a different default (home) path on gWindows.
if not os.path.exists(goma_home_dir) and sys.platform.startswith(('cygwin', 'win')):
goma_home_dir = os.path.join('c:\\', 'src', 'goma', 'goma-win64')

if args.goma and goma_dir:
gn_args['use_goma'] = True
gn_args['goma_dir'] = goma_dir
Expand Down