Merge pull request #99386 from dustdfg/scons_ninja_file_regression

SCons: Pass `ninja_file` variable in tool instead of default name
This commit is contained in:
Thaddeus Crews 2024-11-18 09:23:39 -06:00
commit a46abc4f15
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 4 additions and 4 deletions

4
.gitignore vendored
View File

@ -36,8 +36,8 @@ compile_commands.json
platform/windows/godot_res.res
# Ninja build files
build.ninja
.ninja
*.ninja
.ninja/
run_ninja_env.bat
# Generated by Godot binary

View File

@ -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: