aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc/msvc.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-11-26 17:40:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-11-26 17:40:11 +0200
commit8fbc673998ed0946403b0c89397d68ab93a1c49c (patch)
tree3dd4df011bb55a12263425c2feddd29ff569bdf4 /libbuild2/cc/msvc.cxx
parent0e9bf64dadc029bdf3e97ffb982d297eee0499e4 (diff)
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).
Diffstat (limited to 'libbuild2/cc/msvc.cxx')
-rw-r--r--libbuild2/cc/msvc.cxx6
1 files changed, 3 insertions, 3 deletions
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<libi> (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)