X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=820fb5b670bfc600a6df879bdc2c15f26ef39452;hp=869a1e3899c4c3d4adfd6ff06da83fde142230d9;hb=f5413fd8f007164591af26be9ded15ee7c707540;hpb=a4f02f02d4682c7f504e46ff2ce8f93035fd36dd

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());
 	}