Add a list of auxiliary suffixes to Tool

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 7febdb62b78c58d3e3ca0813ea526d12284e6798..75f935d505e4c4388c9d1073c1de0ec7a01786a6 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -5,7 +5,7 @@
 #include "csourcefile.h"
 #include "misc.h"
 #include "sharedlibrary.h"
-#include "systemlibrary.h"
+#include "staticlibrary.h"
 #include "virtualfilesystem.h"
 
 using namespace std;
@@ -40,15 +40,13 @@ 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<string> &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<string>::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;
@@ -77,9 +75,8 @@ FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path
                        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();
@@ -91,12 +88,10 @@ FileTarget *VirtualFileSystem::find_header(const string &include, const FS::Path
                syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
 
        FileTarget *tgt = 0;
-       if(include[0]=='\"')
-               tgt = get_header(FS::Path(from)/fn);
-       for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-               tgt = get_header(FS::Path(*j)/fn);
-       for(list<string>::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);
+       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));
 
@@ -168,7 +163,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 +177,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;