Use a separate category for import library filename patterns

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 5c548980073b9b46ac39da6982e4e5c2c8abfb66..36fe1c129190e83ebd7736e7557a2619d27e9db8 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -35,13 +35,15 @@ 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, 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;
 
+       tool->prepare();
+
        list<FS::Path> combined_path(path.begin(), path.end());
        if(use_syspath)
        {
@@ -74,7 +76,8 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
        list<FS::Path> combined_path(path.begin(), path.end());
        if(use_syspath)
        {
-               const Tool &linker = builder.get_toolchain().get_tool("LINK");
+               Tool &linker = builder.get_toolchain().get_tool("LINK");
+               linker.prepare();
                const Tool::SearchPath &syspath = linker.get_system_path();
                combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
        }
@@ -82,12 +85,17 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
        const Architecture &arch = builder.get_current_arch();
 
        list<string> shared_names;
+       bool use_import_lib = false;
        if(mode!=BuildInfo::FORCE_STATIC)
-               shared_names = Pattern::apply_list(arch.get_shared_library_patterns(), lib);
+       {
+               shared_names = Pattern::apply_list(arch.get_patterns<ImportLibrary>(), lib);
+               if(!(use_import_lib = !shared_names.empty()))
+                       shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
+       }
 
        list<string> static_names;
        if(mode!=BuildInfo::FORCE_DYNAMIC)
-               static_names = Pattern::apply_list(arch.get_static_library_patterns(), lib);
+               static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
        for(list<FS::Path>::const_iterator i=combined_path.begin(); i!=combined_path.end(); ++i)
        {
@@ -105,10 +113,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                                builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, i->str()));
                                if(cur_names==&shared_names)
                                {
-                                       /* XXX Hack: create ImportLibraries here; they should be handled
-                                       separately, but I need a more generic way of handling all these
-                                       filename patterns */
-                                       if(FS::extpart(*j)==".a")
+                                       if(use_import_lib)
                                                return new ImportLibrary(builder, filename);
                                        return new SharedLibrary(builder, filename);
                                }
@@ -137,7 +142,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)