From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 2 Jan 2023 22:23:11 +0000 (+0200)
Subject: Explicitly set import library name with MSVC linker
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=1a4337301632aa31dbc028d1c4260b5ff3052570;p=builder.git

Explicitly set import library name with MSVC linker

Also disable import library if one does not exist in the build.
---

diff --git a/plugins/msvc/msvclinker.cpp b/plugins/msvc/msvclinker.cpp
index 19ee284..ca77a28 100644
--- a/plugins/msvc/msvclinker.cpp
+++ b/plugins/msvc/msvclinker.cpp
@@ -94,8 +94,13 @@ ExternalTask::Arguments MsvcLinker::_run(const Binary &bin, FS::Path &work_dir)
 	argv.push_back(tool.get_executable()->get_path().str());
 	argv.push_back("/NOLOGO");
 
-	if(dynamic_cast<const SharedLibrary *>(&bin))
+	string imp_fn;
+	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
+	{
 		argv.push_back("/DLL");
+		if(const ImportLibrary *imp = shlib->get_import_library())
+			imp_fn = relative(imp->get_path(), work_dir).str();
+	}
 
 	BuildInfo binfo;
 	bin.collect_build_info(binfo);
@@ -108,6 +113,10 @@ ExternalTask::Arguments MsvcLinker::_run(const Binary &bin, FS::Path &work_dir)
 		argv.push_back("/DEBUG:FULL");
 
 	argv.push_back("/OUT:"+relative(bin.get_path(), work_dir).str());
+	if(!imp_fn.empty())
+		argv.push_back("/IMPLIB:"+imp_fn);
+	else
+		argv.push_back("/NOIMPLIB");
 
 	for(Target *d: bin.get_dependencies())
 	{