diff options
| author | TBK <tbk@jjtc.eu> | 2020-02-28 17:39:48 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-10 10:09:41 +0000 |
| commit | 9a9c92814f4cdfb6c0e0ea64de80dd6fc6768354 (patch) | |
| tree | 4213e54b7f9c34ab268751fb58f491a378cfd011 /community/chromium/gn_bootstrap_ninja.patch | |
| parent | 3de17b3cc40b8a864ac86542b7dc4820c9fbffe1 (diff) | |
| download | aports-9a9c92814f4cdfb6c0e0ea64de80dd6fc6768354.tar.bz2 aports-9a9c92814f4cdfb6c0e0ea64de80dd6fc6768354.tar.xz | |
community/chromium: upgrade to 80.0.3987.122
Diffstat (limited to 'community/chromium/gn_bootstrap_ninja.patch')
| -rw-r--r-- | community/chromium/gn_bootstrap_ninja.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/community/chromium/gn_bootstrap_ninja.patch b/community/chromium/gn_bootstrap_ninja.patch new file mode 100644 index 0000000000..88dc0a6500 --- /dev/null +++ b/community/chromium/gn_bootstrap_ninja.patch @@ -0,0 +1,32 @@ +Patch by Michael Forney <mforney@mforney.org> + +Already merged https://chromium-review.googlesource.com/c/chromium/src/+/1975453 + +--- tools/gn/bootstrap/bootstrap.py ++++ tools/gn/bootstrap/bootstrap.py +@@ -70,6 +70,7 @@ + out_dir = os.path.join(SRC_ROOT, build_rel) + gn_path = options.output or os.path.join(out_dir, 'gn') + gn_build_dir = os.path.join(out_dir, 'gn_build') ++ ninja_binary = os.environ.get('NINJA', 'ninja') + + # TODO(thomasanderson): Remove this once Ubuntu Trusty reaches EOL, or when + # Chromium's infrastructure is upgraded from Trusty to Xenial, whichever comes +@@ -90,7 +91,7 @@ + os.environ.get('CFLAGS', '').split() + + os.environ.get('CXXFLAGS', '').split()), + ]) + '\n') +- subprocess.check_call(['ninja', '-C', libcxx_dir]) ++ subprocess.check_call([ninja_binary, '-C', libcxx_dir]) + shutil.copy2(os.path.join(gn_build_dir, 'libc++.gn.so'), out_dir) + + def append_to_env(var, vals): +@@ -120,7 +121,7 @@ + shutil.copy2( + os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) + subprocess.check_call( +- ['ninja', '-C', gn_build_dir, 'gn', '-w', 'dupbuild=err']) ++ [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']) + shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path) + + if not options.skip_generate_buildfiles: |