summaryrefslogtreecommitdiffstats
path: root/methods.py
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-04-19 16:28:03 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-04-19 16:28:03 +0200
commit21140aad73441801521e18b7b273fb1ef2fc7074 (patch)
tree9b68762421f870691f41d7646cbccd973ae40fa5 /methods.py
parenta523532d18918eacee97c52d8c811db4f693ae09 (diff)
parenta7e7167a859bc3daf77dfb2c99d1a4e4ada7f703 (diff)
downloadredot-engine-21140aad73441801521e18b7b273fb1ef2fc7074.tar.gz
Merge pull request #90858 from Repiteo/scons/show_progress-tweaks
SCons: Disable `show_progress` with Ninja
Diffstat (limited to 'methods.py')
-rw-r--r--methods.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/methods.py b/methods.py
index 4d1f4c1cda..8498310bf5 100644
--- a/methods.py
+++ b/methods.py
@@ -990,6 +990,10 @@ def using_emcc(env):
def show_progress(env):
+ if env["ninja"]:
+ # Has its own progress/tracking tool that clashes with ours
+ return
+
import sys
from SCons.Script import Progress, Command, AlwaysBuild