Don't treat using deprecated declarations as errors

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 5c548980073b9b46ac39da6982e4e5c2c8abfb66..869a1e3899c4c3d4adfd6ff06da83fde142230d9 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -35,10 +35,10 @@ 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, const 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;
 
@@ -137,7 +137,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)