aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-11-22 18:12:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-11-22 18:12:55 +0200
commitc80460cbf9af1a4dbb8d7da8cda4b2b3e8ddb0cd (patch)
treeb7c32e0090bfa29cac2879123e7d7c603288c890
parente7daf01b84ee6ae96915390d9e2f3c5defaaf1ca (diff)
Rename .exe.d to just .d to test Windows interference theory
-rw-r--r--build2/cc/link-rule.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index 47c058d..24572d6 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -1639,7 +1639,9 @@ namespace build2
// Open the dependency database (do it before messing with Windows
// manifests to diagnose missing output directory).
//
- depdb dd (tp + ".d");
+ depdb dd ((lt.executable () && tclass == "windows"
+ ? tp.base ()
+ : tp) + ".d");
// If targeting Windows, take care of the manifest.
//
@@ -2576,13 +2578,13 @@ namespace build2
{
if (tsys == "mingw32")
return clean_extra (
- a, t, {".d", ".dlls/", ".manifest.o", ".manifest"});
+ a, t, {"-.d", ".dlls/", ".manifest.o", ".manifest"});
else
// Assuming it's VC or alike. Clean up .ilk in case the user
// enabled incremental linking (note that .ilk replaces .exe).
//
return clean_extra (
- a, t, {".d", ".dlls/", ".manifest", "-.ilk"});
+ a, t, {"-.d", ".dlls/", ".manifest", "-.ilk"});
}
// For other platforms it's the defaults.
}