From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Wed, 7 Nov 2018 15:20:24 +0000 (+0100)
Subject: Support gcc-8 -ffile-prefix-map
X-Git-Tag: v3.6~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=919af39ccaca;p=thirdparty%2Fccache.git

Support gcc-8 -ffile-prefix-map

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70268
---

diff --git a/src/ccache.c b/src/ccache.c
index bade8470f..e77755e81 100644
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -1786,6 +1786,12 @@ calculate_object_hash(struct args *args, struct hash *hash, int direct_mode)
 		if (str_startswith(args->argv[i], "-fdebug-prefix-map=")) {
 			continue;
 		}
+		if (str_startswith(args->argv[i], "-ffile-prefix-map=")) {
+			continue;
+		}
+		if (str_startswith(args->argv[i], "-fmacro-prefix-map=")) {
+			continue;
+		}
 
 		// When using the preprocessor, some arguments don't contribute to the
 		// hash. The theory is that these arguments will change the output of -E if
@@ -2449,11 +2455,12 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
 			args_add(stripped_args, argv[i]);
 			continue;
 		}
-		if (str_startswith(argv[i], "-fdebug-prefix-map=")) {
+		if (str_startswith(argv[i], "-fdebug-prefix-map=") ||
+		    str_startswith(argv[i], "-ffile-prefix-map=")) {
 			debug_prefix_maps = x_realloc(
 				debug_prefix_maps,
 				(debug_prefix_maps_len + 1) * sizeof(char *));
-			debug_prefix_maps[debug_prefix_maps_len++] = x_strdup(argv[i] + 19);
+			debug_prefix_maps[debug_prefix_maps_len++] = x_strdup(&argv[i][argv[i][2] == 'f' ? 18 : 19]);
 			args_add(stripped_args, argv[i]);
 			continue;
 		}