Retrieve system paths from appropriate tools

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index d5cf909e5f7c284d6121917b4f82f51ab2cea273..bff2886219ce7c4eb745083c749a896e2ad41674 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -1,4 +1,5 @@
 #include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
@@ -6,6 +7,7 @@
 #include "misc.h"
 #include "sharedlibrary.h"
 #include "staticlibrary.h"
+#include "tool.h"
 #include "virtualfilesystem.h"
 
 using namespace std;
@@ -54,19 +56,16 @@ FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath
        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());
+       // 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;
        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)
+       for(Tool::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));
@@ -74,7 +73,7 @@ FileTarget *VirtualFileSystem::find_header(const string &name, const SearchPath
        return tgt;
 }
 
-FileTarget *VirtualFileSystem::find_library(const string &lib, const list<string> &path, LibMode mode)
+FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, LibMode mode)
 {
        string hash(8, 0);
        for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
@@ -85,27 +84,16 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const list<string
        if(i!=library_cache.end())
                return i->second;
 
-       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));