summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorSpartan322 <Megacake1234@gmail.com>2024-11-19 11:38:29 -0500
committerSpartan322 <Megacake1234@gmail.com>2024-11-19 11:39:37 -0500
commitcfc378b251e4330c6b6be949d4c054f9bae48159 (patch)
tree148a5511d3c1d723b2f2f364c832c2ba6f267fcc /SConstruct
parent9767837a7ec40697788765e581131cb2cf172567 (diff)
parentfd4c29a189e53a1e085df5b9b9a05cac9351b3ef (diff)
downloadredot-engine-cfc378b251e4330c6b6be949d4c054f9bae48159.tar.gz
Merge commit godotengine/godot@fd4c29a189e53a1e085df5b9b9a05cac9351b3ef
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index 1c1a654b7a..a4a43e7f8b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1050,7 +1050,7 @@ if env["ninja"]:
SetOption("experimental", "ninja")
env["NINJA_FILE_NAME"] = env["ninja_file"]
env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"]
- env.Tool("ninja", "build.ninja")
+ env.Tool("ninja", env["ninja_file"])
# Threads
if env["threads"]:
@@ -1112,7 +1112,7 @@ atexit.register(print_elapsed_time)
def purge_flaky_files():
- paths_to_keep = ["build.ninja"]
+ paths_to_keep = [env["ninja_file"]]
for build_failure in GetBuildFailures():
path = build_failure.node.path
if os.path.isfile(path) and path not in paths_to_keep: