浏览代码

Merge pull request #96712 from Riteo/slightly-sconserned

SCons: Make ninja output file consistent
Rémi Verschelde 1 年之前
父节点
当前提交
d0c9023b51
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      SConstruct

+ 2 - 2
SConstruct

@@ -1053,7 +1053,7 @@ if env["ninja"]:
     SetOption("experimental", "ninja")
     SetOption("experimental", "ninja")
     env["NINJA_FILE_NAME"] = env["ninja_file"]
     env["NINJA_FILE_NAME"] = env["ninja_file"]
     env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"]
     env["NINJA_DISABLE_AUTO_RUN"] = not env["ninja_auto_run"]
-    env.Tool("ninja")
+    env.Tool("ninja", "build.ninja")
 
 
 # Threads
 # Threads
 if env["threads"]:
 if env["threads"]:
@@ -1116,7 +1116,7 @@ atexit.register(print_elapsed_time)
 
 
 
 
 def purge_flaky_files():
 def purge_flaky_files():
-    paths_to_keep = ["ninja.build"]
+    paths_to_keep = ["build.ninja"]
     for build_failure in GetBuildFailures():
     for build_failure in GetBuildFailures():
         path = build_failure.node.path
         path = build_failure.node.path
         if os.path.isfile(path) and path not in paths_to_keep:
         if os.path.isfile(path) and path not in paths_to_keep: