Skip to content

Commit

Permalink
Build: make ninja output file consistent
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
Riteo committed Sep 8, 2024
1 parent 5675c76 commit 0d40efb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 0d40efb

Please sign in to comment.