Merge pull request #385 from rmatev/fix-pump-MMD

Only add -MMD for pump mode if not present already

2 files changed, 7 insertions, 14 deletions

diff --git a/src/serve.c b/src/serve.c
index 8fe4966..c5ba473 100644
--- a/src/serve.c
+++ b/src/serve.c
@@ -591,7 +591,9 @@ static int tweak_arguments_for_server(char **argv,
     if ((ret = dcc_convert_mt_to_dotd_target(*tweaked_argv, dotd_target)))
       return 1;
 
-    dcc_argv_append(*tweaked_argv, strdup("-MMD"));
+    if (!dcc_argv_search(*tweaked_argv, "-MD") && !dcc_argv_search(*tweaked_argv, "-MMD")) {
+        dcc_argv_append(*tweaked_argv, strdup("-MMD"));
+    }
     dcc_argv_append(*tweaked_argv, strdup("-MF"));
     dcc_argv_append(*tweaked_argv, strdup(deps_fname));
 
diff --git a/test/testdistcc.py b/test/testdistcc.py
index 767c947..edf5f2f 100755
--- a/test/testdistcc.py
+++ b/test/testdistcc.py
@@ -1256,7 +1256,6 @@ class Gdb_Case(CompileHello_Case):
         """Return command to compile source"""
         os.mkdir("obj")
         return self.distcc_without_fallback() + self.compiler() + \
-               self.build_id + \
                " -o obj/testtmp.o -I. -c %s" % (self.sourceFilename())
 
     def link(self):
@@ -1610,9 +1609,7 @@ class DashMD_DashMF_DashMT_Case(CompileHello_Case):
     """Test -MD -MFfoo -MTbar"""
 
     def compileOpts(self):
-        opts = "-MD -MFdotd_filename -MTtarget_name_42"
-        opts += " -Qunused-arguments" if self.is_clang(self._cc) else ""
-        return opts
+        return "-MD -MFdotd_filename -MTtarget_name_42"
 
     def runtest(self):
         try:
@@ -1628,9 +1625,7 @@ class DashWpMD_Case(CompileHello_Case):
     """Test -Wp,-MD,depfile"""
 
     def compileOpts(self):
-        opts = "-Wp,-MD,depsfile"
-        opts += " -Qunused-arguments" if self.is_clang(self._cc) else ""
-        return opts
+        return "-Wp,-MD,depsfile"
 
     def runtest(self):
         try:
@@ -1639,12 +1634,8 @@ class DashWpMD_Case(CompileHello_Case):
           pass
         self.compile()
         deps = open('depsfile').read()
-        self.assert_re_search(r"testhdr.h", deps);
-        # The following assertion is commented out for now
-        # because it does not pass in pump mode.
-        # FIXME This is a real bug that we need to fix!
-        #       Pump mode is treating -MD as if it was -MMD.
-        # self.assert_re_search(r"stdio.h", deps);
+        self.assert_re_search(r"testhdr\.h", deps)
+        self.assert_re_search(r"stdio\.h", deps)
 
 class ScanIncludes_Case(CompileHello_Case):
     """Test --scan-includes"""