From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 1 Dec 2017 09:18:24 +0000 (+0200)
Subject: Prepare tools before querying their system path in the VFS
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f5413fd8f007164591af26be9ded15ee7c707540;p=builder.git

Prepare tools before querying their system path in the VFS
---

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 869a1e3..820fb5b 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -35,13 +35,15 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
 	builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name()));
 }
 
-FileTarget *VirtualFileSystem::find_header(const string &name, const Tool *tool, const SearchPath &path, bool use_syspath)
+FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
 {
 	if(!tool)
 		tool = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(name)), true);
 	if(!tool)
 		return 0;
 
+	tool->prepare();
+
 	list<FS::Path> combined_path(path.begin(), path.end());
 	if(use_syspath)
 	{
@@ -74,7 +76,8 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 	list<FS::Path> combined_path(path.begin(), path.end());
 	if(use_syspath)
 	{
-		const Tool &linker = builder.get_toolchain().get_tool("LINK");
+		Tool &linker = builder.get_toolchain().get_tool("LINK");
+		linker.prepare();
 		const Tool::SearchPath &syspath = linker.get_system_path();
 		combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
 	}
diff --git a/source/virtualfilesystem.h b/source/virtualfilesystem.h
index 90151fe..a3327de 100644
--- a/source/virtualfilesystem.h
+++ b/source/virtualfilesystem.h
@@ -42,7 +42,7 @@ public:
 	/** Locates a source file.  If a file is found but no target is associated
 	with it, a new package-less target is created with the appropriate tool.  If
 	use_syspath is true, the system path reported by the tool is also searched. */
-	FileTarget *find_header(const std::string &, const Tool *, const SearchPath &, bool use_syspath = true);
+	FileTarget *find_header(const std::string &, Tool *, const SearchPath &, bool use_syspath = true);
 
 	/** Locates a library.  The library name should be the same as what would be
 	used in linking with the library.  If a file is found but no target is