diff --git a/CHANGES.txt b/CHANGES.txt index 9942c2518..bbe662b85 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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 diff --git a/RELEASE.txt b/RELEASE.txt index d386cb339..144c700ba 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -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 ------------ diff --git a/SCons/Tool/ninja_tool/NinjaState.py b/SCons/Tool/ninja_tool/NinjaState.py index 274331e0d..ef11b5038 100644 --- a/SCons/Tool/ninja_tool/NinjaState.py +++ b/SCons/Tool/ninja_tool/NinjaState.py @@ -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": {