- string hash(8, 0);
- for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
- update_hash(hash, *i);
-
- string id = hash+name;
- TargetMap::iterator i = include_cache.find(id);
- if(i!=include_cache.end())
- return i->second;
-
- if(builder.get_verbose()>=5)
- IO::print("Looking for header %s with path %s\n", name, join(path.begin(), path.end()));
-
- SearchPath syspath;
- const Architecture &arch = builder.get_current_arch();
- if(arch.is_native())
- syspath.push_back("/usr/include");
- else
- syspath.push_back("/usr/"+arch.get_cross_prefix()+"/include");
- if(cxx_ver!="-")
- syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
-
- FileTarget *tgt = 0;
- for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
- tgt = get_header(FS::Path(*j)/name);
- for(SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt = get_header(FS::Path(*j)/name);
-
- include_cache.insert(TargetMap::value_type(id, tgt));
-
- return tgt;
-}
-
-FileTarget *VirtualFileSystem::find_library(const string &lib, const list<string> &path, LibMode mode)
-{
- string hash(8, 0);
- for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
- update_hash(hash, *i);
+ // 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)
+ return 0;
+ const Tool::SearchPath &syspath = tool->get_system_path();