diff options
| author | Riteo <riteo@posteo.net> | 2024-09-08 16:30:29 +0200 |
|---|---|---|
| committer | Riteo <riteo@posteo.net> | 2024-09-08 16:30:29 +0200 |
| commit | 0d40efbe6676ba52f31d504e5da9bd82d8425cdd (patch) | |
| tree | a3a9039a56be81bae5bc64394ef99f5e21104d51 /SConstruct | |
| parent | 5675c76461e197d3929a1142cfb84ab1a76ac9dd (diff) | |
| download | redot-engine-0d40efbe6676ba52f31d504e5da9bd82d8425cdd.tar.gz | |
Build: make ninja output file consistent
After upgrading, I noticed that the SCons ninja output had a different
filename which messed up the "flaky file" logic.
This patch explicitly passes it to the tool and switches to
`build.ninja` (ninja's default).
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 5c1ccd2449..178f2d86a2 100644 --- a/SConstruct +++ b/SConstruct @@ -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: |