-
Notifications
You must be signed in to change notification settings - Fork 727
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
devel/electron27: Fix build with ninja 1.12.0
Fix race conditions where generated headers are not created before they are needed in the build. Ninja 1.12.0 removed the `-w dupbuild` option and the default behavior is now equivalent to passing `-w dupbuild=err` in previous versions. PR: 278693 Approved by: portmgr (blanket)
- Loading branch information
Showing
2 changed files
with
24 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
devel/electron27/files/patch-tools_gn_bootstrap_bootstrap.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- tools/gn/bootstrap/bootstrap.py.orig 2023-11-01 19:30:06 UTC | ||
+++ tools/gn/bootstrap/bootstrap.py | ||
@@ -122,7 +122,7 @@ def main(argv): | ||
shutil.copy2( | ||
os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) | ||
- cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] | ||
+ cmd = [ninja_binary, '-C', gn_build_dir, 'gn'] | ||
if options.jobs: | ||
cmd += ['-j', str(options.jobs)] | ||
subprocess.check_call(cmd) |