Merge branch 'maint'

* maint:
  Prepare for version 3.1.3
  Handle -MFarg, -MTarg and -MQarg compiler options correctly

Conflicts:
	test/test_argument_processing.c

1 files changed, 19 insertions, 7 deletions

diff --git a/ccache.c b/ccache.c
index 84eec435..5e68269d 100644
--- a/ccache.c
+++ b/ccache.c
@@ -1395,19 +1395,31 @@ cc_process_args(struct args *orig_args, struct args **preprocessor_args,
 			continue;
 		}
 		if (i < argc - 1) {
-			if (str_eq(argv[i], "-MF")) {
+			if (str_startswith(argv[i], "-MF")) {
+				char *arg;
 				dependency_filename_specified = true;
 				free(output_dep);
-				output_dep = make_relative_path(x_strdup(argv[i + 1]));
 				args_add(dep_args, argv[i]);
-				args_add(dep_args, argv[i + 1]);
-				i++;
+				if (strlen(argv[i]) == 3) {
+					/* -MF arg */
+					arg = argv[i + 1];
+					args_add(dep_args, argv[i + 1]);
+					i++;
+				} else {
+					/* -MFarg */
+					arg = &argv[i][3];
+				}
+				output_dep = make_relative_path(x_strdup(arg));
 				continue;
-			} else if (str_eq(argv[i], "-MQ") || str_eq(argv[i], "-MT")) {
+			} else if (str_startswith(argv[i], "-MQ")
+			           || str_startswith(argv[i], "-MT")) {
 				dependency_target_specified = true;
 				args_add(dep_args, argv[i]);
-				args_add(dep_args, argv[i + 1]);
-				i++;
+				if (strlen(argv[i]) == 3) {
+					/* -MQ arg or -MT arg */
+					args_add(dep_args, argv[i + 1]);
+					i++;
+				}
 				continue;
 			}
 		}