]> git.tdb.fi Git - builder.git/blobdiff - source/virtualfilesystem.cpp
Prepare tools before querying their system path in the VFS
[builder.git] / source / virtualfilesystem.cpp
index 2f4ee645281c1727aca01cb0b4abced00124a463..820fb5b670bfc600a6df879bdc2c15f26ef39452 100644 (file)
@@ -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 SearchPath &path, bool use_syspath)
+FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
 {
-       // XXX This will cause trouble with multiple architectures in a single build
-       const Tool *tool = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(name)), true);
+       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());
        }
@@ -118,7 +121,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 
                        if(++j==cur_names->end())
                        {
-                               if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)        
+                               if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)
                                        cur_names = &static_names;
                                else if(mode==BuildInfo::STATIC && cur_names==&static_names)
                                        cur_names = &shared_names;
@@ -137,7 +140,9 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 FileTarget *VirtualFileSystem::find_binary(const string &name)
 {
        SearchPath path;
-       if(const char *env_path = getenv("PATH"))
+       if(FS::Path(name).is_absolute())
+               path.push_back("/");
+       else if(const char *env_path = getenv("PATH"))
        {
                vector<string> parts = split(env_path, ':');
                for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)