godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96712 from Riteo/slightly-sconserned 

SCons: Make ninja output file consistent
This commit is contained in:
Rémi Verschelde 2024-09-08 23:22:23 +02:00
parent 20115dc36f 0d40efbe66
commit d0c9023b51
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -1053,7 +1053,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")
env.Tool("ninja", "build.ninja")
# Threads
if env["threads"]:
@ -1116,7 +1116,7 @@ atexit.register(print_elapsed_time)
def purge_flaky_files():
paths_to_keep = ["ninja.build"]
paths_to_keep = ["build.ninja"]
for build_failure in GetBuildFailures():
path = build_failure.node.path
if os.path.isfile(path) and path not in paths_to_keep: