summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Scott <ascott.ca@gmail.com>2024-12-17 15:00:07 (GMT)
committerAdam Scott <ascott.ca@gmail.com>2024-12-17 15:27:13 (GMT)
commit7e70985f8426f28df609b858254a32a9c82684c1 (patch)
treef5fa0658087bc2d6a87601dfd799dd3b473adb4a
parent8bd8b4e5dec94fc6a45e021b8ea5b12c12cc949f (diff)
downloadSCons-7e70985f8426f28df609b858254a32a9c82684c1.zip
SCons-7e70985f8426f28df609b858254a32a9c82684c1.tar.gz
SCons-7e70985f8426f28df609b858254a32a9c82684c1.tar.bz2
Set TEMPLATE rule to `install_pool` for the Ninja tool
-rw-r--r--CHANGES.txt4
-rw-r--r--SCons/Tool/ninja_tool/NinjaState.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9942c25..fb6a47e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -190,6 +190,10 @@ 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 the TEMPLATE rule of the Ninja tool to use the `install_pool`
+ instead of `local_pool` in order to curb some race conditions.
+
RELEASE 4.8.1 - Tue, 03 Sep 2024 17:22:20 -0700
diff --git a/SCons/Tool/ninja_tool/NinjaState.py b/SCons/Tool/ninja_tool/NinjaState.py
index 274331e..ef11b50 100644
--- a/SCons/Tool/ninja_tool/NinjaState.py
+++ b/SCons/Tool/ninja_tool/NinjaState.py
@@ -231,7 +231,7 @@ class NinjaState:
"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": {