mirror of
https://github.com/godotengine/godot.git
synced 2024-11-23 04:33:29 +00:00
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:
commit
a46abc4f15
4
.gitignore
vendored
4
.gitignore
vendored
@ -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
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user