Skip to content

Commit

Permalink
Merge pull request godotengine#96712 from Riteo/slightly-sconserned
Browse files Browse the repository at this point in the history
SCons: Make ninja output file consistent
  • Loading branch information
akien-mga committed Sep 8, 2024
2 parents 20115dc + 0d40efb commit d0c9023
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 d0c9023

Please sign in to comment.