From c80460cbf9af1a4dbb8d7da8cda4b2b3e8ddb0cd Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 22 Nov 2018 18:12:55 +0200 Subject: Rename .exe.d to just .d to test Windows interference theory --- build2/cc/link-rule.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'build2') 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. } -- cgit v1.1