aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-08-06 14:00:44 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-08-06 14:00:44 +0200
commit55bc2627dcca7f126580a0d89d786004dab2653c (patch)
tree8f1c74654d4f8a2712e21be2aa4ecbb59bf287e4
parentc6b7919ba8ba1d337574671cadd6635f6267dc54 (diff)
Fix GCC -M/-MD logic some more
-rw-r--r--build2/cc/compile.cxx11
1 files changed, 2 insertions, 9 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 7553ac3..c703a8a 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -1861,20 +1861,13 @@ namespace build2
//
args[i++] = "-M";
args[i++] = "-MG";
+ args[i++] = src.path ().string ().c_str ();
+ args[i] = nullptr;
if (cid == compiler_id::gcc)
{
sense_diag = false;
-
- // While GCC implies -w in case of -M, it seems to be possible
- // to re-enable it with -W or -Werror. So we explicitly disable
- // it, for good measure.
- //
- args[i++] = "-w";
}
-
- args[i++] = src.path ().string ().c_str ();
- args[i] = nullptr;
}
else
{