From 3ac9b0bc939bb28d4c0f68fc186572ccde8a9956 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 7 Dec 2022 13:54:13 +0200 Subject: Fix bug in MSVC library_type() implementation (GH issue #235) It looks like the implementation was botched a bit when switching from link.exe /DUMP /ARCHIVEMEMBERS to link.exe /LIB /LIST. --- libbuild2/cc/msvc.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libbuild2/cc/msvc.cxx b/libbuild2/cc/msvc.cxx index 23fb87b..9139891 100644 --- a/libbuild2/cc/msvc.cxx +++ b/libbuild2/cc/msvc.cxx @@ -471,14 +471,11 @@ namespace build2 // libhello\hello.lib.obj // hello-0.1.0-a.0.19700101000000.dll // - // Archive member name at 746: [...]hello.dll[/][ ]* - // Archive member name at 8C70: [...]hello.lib.obj[/][ ]* - // size_t n (s.size ()); for (; n != 0 && s[n - 1] == ' '; --n) ; // Skip trailing spaces. - if (n >= 7) // At least ": X.obj" or ": X.dll". + if (n >= 5) // At least "X.obj" or "X.dll". { n -= 4; // Beginning of extension. -- cgit v1.1