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

Unified Diff: mojo/tools/mojob.py

Issue 685203004: A few fixes to make Windows Mojo build work. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/config/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/tools/mojob.py
diff --git a/mojo/tools/mojob.py b/mojo/tools/mojob.py
index 893358c78d276e6a0ba4d8f9c97708eb9ac1f309..d0505b8fcc443099d8b65c9ed1b994335465e9d8 100755
--- a/mojo/tools/mojob.py
+++ b/mojo/tools/mojob.py
@@ -38,6 +38,10 @@ def gn(args):
gn_args.append('is_asan=' + ('true' if args.asan else 'false'))
gn_args.append('is_clang=' + ('true' if args.clang else 'false'))
+ if platform.system() == 'Windows':
+ # Force x64 for now to avoid .asm build problems
+ gn_args.append('force_win64=true')
+
goma_dir = os.environ.get('GOMA_DIR')
goma_home_dir = os.path.join(os.getenv('HOME', ''), 'goma')
if args.goma and goma_dir:
@@ -67,6 +71,8 @@ def gn(args):
def get_gn_arg_value(out_dir, arg):
+ if platform.system() == 'Windows':
+ return None # TODO(jam): implement
command = (r'''grep -m 1 "^[[:space:]]*\<%s\>" "%s/args.gn" |
sed -n 's/.* = "\?\([^"]*\)"\?$/\1/p' ''') % (arg, out_dir)
return subprocess.check_output(command, shell=True).strip()
@@ -242,6 +248,9 @@ def main():
if args.android:
args.clang = False
+ if platform.system() == 'Windows':
+ args.clang = False
+
return args.func(args)
« no previous file with comments | « gpu/config/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698