Commit 7330a6102f7a8108ee364b9de79efe4a70049167 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-05-13 12:15:55-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-05-13 12:15:55-04:00
log	7330a6102f7a8108ee364b9de79efe4a70049167
tree	5b695c1cc8f10d1d153411d5ee6ff0ddf7e56dc2
parent	f3db3b3c1319e2e86bf5eabd2c2eaef58e4dd783
signature	Commit is signed but in an unrecognized format.

2 files changed, 9 insertions(+), 2 deletions(-)

src/cache_hash.cpp+5

 @@ -470,6 +470,11 @@ Error cache_add_dep_file(CacheHash *ch, Buf *dep_file_path, bool verbose) {
     Error err;
     Buf *contents = buf_alloc();
     if ((err = os_fetch_file_path(dep_file_path, contents))) {
+        if (err == ErrorFileNotFound)
+            return err;
+        if (verbose) {
+            fprintf(stderr, "unable to read .d file: %s\n", err_str(err));
+        }
         return ErrorReadingDepFile;
     }
     SplitIterator it = memSplit(buf_to_slice(contents), str("\r\n"));

src/codegen.cpp+4-2

 @@ -8732,12 +8732,14 @@ static void gen_c_object(CodeGen *g, Buf *self_exe_path, CFile *c_file) {
         if ((err = cache_add_dep_file(cache_hash, out_dep_path, true))) {
             // Don't treat the absence of the .d file as a fatal error, the
             // compiler may not produce one eg. when compiling .s files
-            if (err != ErrorReadingDepFile) {
+            if (err != ErrorFileNotFound) {
                 fprintf(stderr, "Failed to add C source dependencies to cache: %s\n", err_str(err));
                 exit(1);
             }
         }
-        os_delete_file(out_dep_path);
+        if (err != ErrorFileNotFound) {
+            os_delete_file(out_dep_path);
+        }
         if ((err = cache_final(cache_hash, &digest))) {
             fprintf(stderr, "Unable to finalize cache hash: %s\n", err_str(err));