diff options
| author | Bert Belder <bertbelder@gmail.com> | 2018-08-17 22:42:26 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2018-08-18 00:58:01 +0200 |
| commit | 3640ea4c0d1e47c672cae94d3f3efe63a845d0ae (patch) | |
| tree | 91288a4b8e5603273b288959a9d26a45f3b6c5d2 | |
| parent | 42e7b7b3e754a9bac9f899eb9d1542ac0becacfd (diff) | |
build: don't clobber rust depfile mtime when fixing its paths
This avoids ninja unnecessarily rebuilding rust targets.
Add a check for problems like these to be run on appveyor.
| -rw-r--r-- | .appveyor.yml | 12 | ||||
| -rw-r--r-- | tools/run_rustc.py | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 91f53aefe..fbe8fe43c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -310,7 +310,9 @@ build_script: # Attempt to work around multiple rustc instances messing with the same file # when building in parallel. # TODO: fix this properly. - - ninja -C out\debug -j 1 build_extra/rust:winapi build_extra/rust:winapi-0.2 + - ps: ninja -C $env:DENO_BUILD_PATH -j 1 + build_extra/rust:winapi build_extra/rust:winapi-0.2 + - python tools\build.py - ps: Set-FilesNeeded -Auto -Reason "Build finished" @@ -321,3 +323,11 @@ test_script: after_test: # Remove stale files and empty dirs from the build directory. - ps: Stop-TraceFilesNeeded + + # Verify that the build is fully up-to-date. Running ninja should be a no-op. + # This catches erroneous file cleanup, and incorrectly set up build deps. + - ps: |- + $out = ninja -C $env:DENO_BUILD_PATH -n -d explain :all + if ($out -notcontains "ninja: no work to do.") { + throw "Build should be up-to-date but isnt't." + } diff --git a/tools/run_rustc.py b/tools/run_rustc.py index 81841eff9..f56ca8eb8 100644 --- a/tools/run_rustc.py +++ b/tools/run_rustc.py @@ -14,6 +14,9 @@ import util # Updates the path of the main target in the depfile to the relative path # from base_path build_output_path def fix_depfile(depfile_path, base_path, build_output_path): + # It's important that the fixed-up depfile has the same mtime as before. + # Ninja relies on it to decide whether to rebuild the target it belongs to. + stat = os.stat(depfile_path) with open(depfile_path, "r") as depfile: content = depfile.read() content_split = content.split(': ', 1) @@ -21,6 +24,7 @@ def fix_depfile(depfile_path, base_path, build_output_path): new_content = "%s: %s" % (target_path, content_split[1]) with open(depfile_path, "w") as depfile: depfile.write(new_content) + os.utime(depfile_path, (stat.st_atime, stat.st_mtime)) def main(): |