aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-11-23 10:53:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-11-23 10:53:26 +0200
commitf9121ebda0d11e28c4fa19401ac9f5dc43e6dca5 (patch)
tree56a8c9bf0d0793ea6620c02afa1f5899d4549fe7
parent66792f8ad2dc0d48c73c72ccc1c527d76f386090 (diff)
Revert rename of .exe.d to .d (did not make any difference)
-rw-r--r--build2/cc/link-rule.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index 24572d6..47c058d 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -1639,9 +1639,7 @@ namespace build2
// Open the dependency database (do it before messing with Windows
// manifests to diagnose missing output directory).
//
- depdb dd ((lt.executable () && tclass == "windows"
- ? tp.base ()
- : tp) + ".d");
+ depdb dd (tp + ".d");
// If targeting Windows, take care of the manifest.
//
@@ -2578,13 +2576,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.
}