Skip to content

Commit

Permalink
Merge pull request #4668 from adamscott/template-pool-to-scons_pool
Browse files Browse the repository at this point in the history
Set TEMPLATE rule to `install_pool` for the Ninja tool
  • Loading branch information
bdbaddog authored Dec 17, 2024
2 parents 8bd8b4e + 45d04e2 commit c76a8c5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- The update-release-info test is adapted to accept changed help output
introduced in Python 3.12.8/3.13.1.

From Adam Scott:
- Changed Ninja's TEMPLATE rule pool to use `install_pool` instead of
`local_pool`, hoping it will fix a race condition that can occurs when
Ninja defers to SCons to build.


RELEASE 4.8.1 - Tue, 03 Sep 2024 17:22:20 -0700

Expand Down
4 changes: 4 additions & 0 deletions RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ FIXES
- Minor modernization: make use of stat object's st_mode, st_mtime
and other attributes rather than indexing into stat return.

- Ninja's TEMPLATE rule pool changed from `local_pool` to `install_pool``
hoping it will fix a race condition that can occurs when Ninja defers
to SCons to build.


IMPROVEMENTS
------------
Expand Down
2 changes: 1 addition & 1 deletion SCons/Tool/ninja_tool/NinjaState.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def __init__(self, env, ninja_file, ninja_syntax) -> None:
"TEMPLATE": {
"command": "$PYTHON_BIN $NINJA_TOOL_DIR/ninja_daemon_build.py $PORT $NINJA_DIR_PATH $out",
"description": "Defer to SCons to build $out",
"pool": "local_pool",
"pool": "install_pool",
"restat": 1
},
"EXIT_SCONS_DAEMON": {
Expand Down

0 comments on commit c76a8c5

Please sign in to comment.