Commit 4eca6135 authored by qyearsley's avatar qyearsley Committed by Commit bot

Follow-up to crrev.com/583793002 -- check if goma_dir is None.

BUG=394990

Review URL: https://codereview.chromium.org/593253002

Cr-Commit-Position: refs/heads/master@{#296312}
parent f73075c9
...@@ -39,9 +39,11 @@ class Builder(object): ...@@ -39,9 +39,11 @@ class Builder(object):
raise RuntimeError( raise RuntimeError(
'Path to visual studio could not be determined.') 'Path to visual studio could not be determined.')
else: else:
# Need to re-escape goma dir, see crbug.com/394990.
if opts.goma_dir:
opts.goma_dir = opts.goma_dir.encode('string_escape')
SetBuildSystemDefault(opts.build_preference, opts.use_goma, SetBuildSystemDefault(opts.build_preference, opts.use_goma,
# Need to re-escape goma dir, see crbug.com/394990 opts.goma_dir)
opts.goma_dir.encode('string_escape'))
else: else:
if not opts.build_preference: if not opts.build_preference:
if 'ninja' in os.getenv('GYP_GENERATORS', default=''): if 'ninja' in os.getenv('GYP_GENERATORS', default=''):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment