Merge branch 'fix-cgcc-gendeps' into tip

* cgcc: -MF, -MQ & -MT need an argument
* cgcc: gendeps for -MM, -MD & -MMD too

1 files changed, 5 insertions, 5 deletions

diff --git a/cgcc b/cgcc
index 7393947c..e0be5893 100755
--- a/cgcc
+++ b/cgcc
@@ -31,10 +31,10 @@ while (@ARGV) {
     # Ditto for stdin.
     $do_check = 1 if $_ eq '-';
 
-    if ($_ eq '-o') {
-	# Need to be checked explicitly since '-o -' is
-	# sometimes used and the '-' would otherwise be
-	# processed as an option.
+    if (/^-(o|MF|MT|MQ)$/) {
+	# Need to be checked explicitly since otherwise
+	# the argument would be processed as a
+	# (non-existant) source file or as an option.
 	die ("$0: missing argument for $_") if !@ARGV;
 	$nargs = 1;
     }
@@ -49,7 +49,7 @@ while (@ARGV) {
 
     $m32 = 1 if /^-m32$/;
     $m64 = 1 if /^-m64$/;
-    $gendeps = 1 if /^-M$/;
+    $gendeps = 1 if /^-(M|MM|MD|MMD)$/;
 
     if (/^-target=(.*)$/) {
 	$check .= &add_specs ($1);