morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refresh no-new-ninja-flag.patch for 67

Browse Source
This commit is contained in:
Eloston
2018-06-01 15:17:54 +00:00
parent 1b9bc64c46
commit fb6a3a4505
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/patches/ubuntu/no-new-ninja-flag.patch
View File

@@ -3,17 +3,17 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -234,7 +234,7 @@ def build_gn_with_ninja_manually(tempdir
@@ -280,7 +280,7 @@ def build_gn_with_ninja_manually(tempdir
write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
root_gen_dir, options)
root_gen_dir, options, windows_x64_toolchain)
- cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
+ cmd = ['ninja', '-C', tempdir]
if options.verbose:
cmd.append('-v')
if options.jobs:
@@ -857,7 +857,7 @@ def build_gn_with_gn(temp_gn, build_dir,
cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
@@ -915,7 +915,7 @@ def build_gn_with_gn(temp_gn, build_dir,
]
check_call(cmd)
- cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']