X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=0ada219aabdae0b4b55d443a558fd4187327836b;hb=8b9f2196ec0a930992614f174b7970c2ed523699;hp=7febdb62b78c58d3e3ca0813ea526d12284e6798;hpb=be6c1ae1dcc97cb3e3019c0384f1bc933fcd321c;p=builder.git diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp index 7febdb6..0ada219 100644 --- a/source/virtualfilesystem.cpp +++ b/source/virtualfilesystem.cpp @@ -1,11 +1,13 @@ #include +#include #include #include #include "builder.h" #include "csourcefile.h" #include "misc.h" #include "sharedlibrary.h" -#include "systemlibrary.h" +#include "staticlibrary.h" +#include "tool.h" #include "virtualfilesystem.h" using namespace std; @@ -40,70 +42,38 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t) targets.insert(TargetMap::value_type(path.str(), t)); } -FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path &from, const list &path) +FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath &path) { string hash(8, 0); - if(include[0]=='\"') - update_hash(hash, from.str()); for(list::const_iterator i=path.begin(); i!=path.end(); ++i) update_hash(hash, *i); - string id = hash+include; + string id = hash+name; TargetMap::iterator i = include_cache.find(id); if(i!=include_cache.end()) return i->second; - static string cxx_ver; - if(cxx_ver.empty()) - { - // XXX This needs to go elsewhere - /*StringList argv; - argv.push_back(current_arch->get_tool("CXX")); - argv.push_back("--version"); - if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv))) - { - cxx_ver = m[0].str; - while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver)) - { - string::size_type dot = cxx_ver.rfind('.'); - if(dot==string::npos) - break; - cxx_ver.erase(dot); - } - if(verbose>=5) - IO::print("C++ version is %s\n", cxx_ver); - } - else*/ - cxx_ver = "-"; - } - - string fn = include.substr(1); if(builder.get_verbose()>=5) - IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end())); + 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()); + // 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(); FileTarget *tgt = 0; - if(include[0]=='\"') - tgt = get_header(FS::Path(from)/fn); - for(list::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) - tgt = get_header(FS::Path(*j)/fn); - for(list::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) - tgt = get_header(FS::Path(*j)/fn); + for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) + tgt = get_header(FS::Path(*j)/name, *tool); + for(Tool::SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) + tgt = get_header(FS::Path(*j)/name, *tool); include_cache.insert(TargetMap::value_type(id, tgt)); return tgt; } -FileTarget *VirtualFileSystem::find_library(const string &lib, const list &path, LibMode mode) +FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, LibMode mode) { string hash(8, 0); for(list::const_iterator i=path.begin(); i!=path.end(); ++i) @@ -114,27 +84,16 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const listsecond; - SearchPath syspath; - const Architecture &arch = builder.get_current_arch(); - if(arch.is_native()) - { - syspath.push_back("/lib"); - syspath.push_back("/usr/lib"); - if(arch.match_name("pc-32-linux")) - syspath.push_back("/usr/lib/i386-linux-gnu"); - else if(arch.match_name("pc-64-linux")) - syspath.push_back("/usr/lib/x86_64-linux-gnu"); - } - else - syspath.push_back("/usr/"+arch.get_cross_prefix()+"/lib"); + const Tool &linker = builder.get_toolchain().get_tool("LINK"); + const Tool::SearchPath &syspath = linker.get_system_path(); if(builder.get_verbose()>=5) IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end())); FileTarget *tgt = 0; - for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) + for(SearchPath::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) tgt = get_library(lib, *j, mode); - for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) + for(Tool::SearchPath::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) tgt = get_library(lib, *j, mode); library_cache.insert(TargetMap::value_type(id, tgt)); @@ -142,17 +101,14 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const list(tool.create_source(fn)); + return 0; } @@ -168,7 +124,7 @@ FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &pa { FileTarget *tgt = get_target(fn); if(!tgt) - return new SystemLibrary(builder, fn.str()); + return new SharedLibrary(builder, fn); else if(mode==DYNAMIC || !tgt->get_package()) return tgt; } @@ -182,7 +138,7 @@ FileTarget *VirtualFileSystem::get_library(const string &lib, const FS::Path &pa if(FileTarget *tgt = get_target(fn)) return tgt; else - return new SystemLibrary(builder, fn.str()); + return new StaticLibrary(builder, fn); } return 0;