From: Anders F Björklund <anders.f.bjorklund@gmail.com>
Date: Sat, 25 Aug 2018 17:56:21 +0000 (+0200)
Subject: Make depend paths relative earlier for depend mode
X-Git-Tag: v3.6~31^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20959c3cfd3b26fff124c8d59eb7e795b97f49a5;p=thirdparty%2Fccache.git

Make depend paths relative earlier for depend mode
---

diff --git a/src/ccache.c b/src/ccache.c
index 8c9c317fb..0a1392408 100644
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -1394,6 +1394,10 @@ to_cache(struct args *args, struct mdfour *depend_mode_hash)
 		failed();
 	}
 
+	if (generating_dependencies) {
+		use_relative_paths_in_depfile(output_dep);
+	}
+
 	if (conf->depend_mode) {
 		struct file_hash *object_hash = object_hash_from_depfile(output_dep, depend_mode_hash);
 		if (!object_hash)
@@ -1435,8 +1439,6 @@ to_cache(struct args *args, struct mdfour *depend_mode_hash)
 
 	copy_file_to_cache(output_obj, cached_obj);
 	if (generating_dependencies) {
-		// GJK: TODO: need to execute this earlier when in depend_mode
-		use_relative_paths_in_depfile(output_dep);
 		copy_file_to_cache(output_dep, cached_dep);
 	}
 	if (generating_coverage) {