X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmsvclinker.cpp;h=968bd5dd884cf6a75442d0587d843b185d338290;hb=68ef01e3f94ba5d0297e7979551e7d9404906db7;hp=f802ef63e454d714cc4a90fe4341997ab87b1726;hpb=1009314aed27a555033e743f84a1e4347d0bad69;p=builder.git

diff --git a/source/msvclinker.cpp b/source/msvclinker.cpp
index f802ef6..968bd5d 100644
--- a/source/msvclinker.cpp
+++ b/source/msvclinker.cpp
@@ -63,23 +63,25 @@ string MsvcLinker::create_build_signature(const BuildInfo &binfo) const
 	return result;
 }
 
-void MsvcLinker::do_prepare()
+void MsvcLinker::do_prepare(ToolData &tool) const
 {
-	string arch_dir = (architecture->get_bits()==64 ? "x64" : "x86");
+	const std::string &tool_tag = static_cast<Tool &>(tool).get_tag();
+	const Architecture &arch = *static_cast<Tool &>(tool).get_architecture();
+	string arch_dir = (arch.get_bits()==64 ? "x64" : "x86");
 
 	const FS::Path &vc_base_dir = ms_tools.get_vc_base_dir();
-	system_path.push_back(vc_base_dir/"lib"/arch_dir);
+	tool.system_path.push_back(vc_base_dir/"lib"/arch_dir);
 
 	const FS::Path &win_sdk_dir = ms_tools.get_windows_sdk_dir();
 	const string &win_sdk_ver = ms_tools.get_windows_sdk_version();
-	system_path.push_back(win_sdk_dir/"lib"/win_sdk_ver/"ucrt"/arch_dir);
-	system_path.push_back(win_sdk_dir/"lib"/win_sdk_ver/"um"/arch_dir);
+	tool.system_path.push_back(win_sdk_dir/"lib"/win_sdk_ver/"ucrt"/arch_dir);
+	tool.system_path.push_back(win_sdk_dir/"lib"/win_sdk_ver/"um"/arch_dir);
 
 	string path;
-	for(const FS::Path &p: system_path)
+	for(const FS::Path &p: tool.system_path)
 	{
 		append(path, ";", p.str());
-		builder.get_logger().log("tools", "Got %s system path: %s", tag, p);
+		builder.get_logger().log("tools", "Got %s system path: %s", tool_tag, p);
 	}
 
 	setenv("LIB", path);