diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-18 09:23:39 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-18 09:23:39 -0600 |
| commit | a46abc4f150dbb77ce82d9fa70219905be55b5dd (patch) | |
| tree | 7d8337a6399ed0580a1538746ba4f45d1f738761 | |
| parent | 8e324c458971592f68dcd4730211574153636aab (diff) | |
| parent | 1250681a4f43282c6e2b466c527d748a940227fa (diff) | |
| download | redot-engine-a46abc4f150dbb77ce82d9fa70219905be55b5dd.tar.gz | |
Merge pull request #99386 from dustdfg/scons_ninja_file_regression
SCons: Pass `ninja_file` variable in tool instead of default name
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | SConstruct | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 0dcf79c460..f72ea1ac51 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/SConstruct b/SConstruct index 234a6624f1..7c7d3d25a0 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: |