From 8fbc673998ed0946403b0c89397d68ab93a1c49c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 26 Nov 2019 17:40:11 +0200 Subject: Rename executable's .lib/.exp to avoid clashes with libraries Failed that we cannot have an executable and a library with the same name and in the same directory (their .lib's will clash). --- libbuild2/cc/msvc.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libbuild2/cc/msvc.cxx') diff --git a/libbuild2/cc/msvc.cxx b/libbuild2/cc/msvc.cxx index a85e7a0..c7022fc 100644 --- a/libbuild2/cc/msvc.cxx +++ b/libbuild2/cc/msvc.cxx @@ -192,13 +192,13 @@ namespace build2 if (l.compare (0, 3, " ") == 0) { // Use the actual import library name if this is a library (since we - // override this name) and the executable name otherwise (by default - // .lib/.exp are named by replacing the .exe extension). + // override this name) and the executable name otherwise (we pass + // /IMPLIB with .lib appended to the .exe extension). // path i ( lt == otype::s ? find_adhoc_member (t)->path ().leaf () - : t.path ().leaf ().base () + ".lib"); + : t.path ().leaf () + ".lib"); if (l.find (i.string ()) != string::npos && l.find (i.base ().string () + ".exp") != string::npos) -- cgit v1.1