Don't overwrite cached .d file with a version with absolute paths

The .d file has already been put in the cache by to_cache (and
potentially converted to relative paths using
use_relative_paths_in_depfile).

This fixes what seems to be a mistake in 38301c0d.

diff --git a/NEWS.txt b/NEWS.txt
index 1eb16f61c276dd65c7e1315cb958ceea5ab0839f..06fbb9fb44453773a62c0e49ace2fc0f894d6990 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -22,6 +22,9 @@ Bug fixes
   corresponding header files have an updated timestamp. This fixes complaints
   from clang.
 
+- Fixed a bug related to erroneously storing a dependency file with absolute
+  paths in the cache on a preprocessed hit.
+
 
 ccache 3.3.4
 ------------

diff --git a/ccache.c b/ccache.c
index fd1b4ce1c8bdbdea8e23a910bd660a9f8421922f..7d05af4dc3b76158e4b82f60f60ab8ea6f960935 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -1964,11 +1964,6 @@ from_cache(enum fromcache_call_mode mode, bool put_object_in_manifest)
                update_mtime(cached_dwo);
        }
 
-       if (generating_dependencies && mode == FROMCACHE_CPP_MODE
-           && !conf->read_only && !conf->read_only_direct) {
-               put_file_in_cache(output_dep, cached_dep);
-       }
-
        send_cached_stderr();
 
        if (put_object_in_manifest) {