#include "builder.h"
#include "csourcefile.h"
#include "executable.h"
+#include "importlibrary.h"
#include "sharedlibrary.h"
#include "staticlibrary.h"
#include "tool.h"
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, const 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;
FS::Path filename = *i / *j;
if(FileTarget *tgt = get_target(filename))
{
- if(cur_names!=&shared_names || mode==BuildInfo::DYNAMIC)
- {
- builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
- return tgt;
- }
+ builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, i->str(), tgt->get_type()));
+ return tgt;
}
else if(file_exists(filename))
{
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")
+ return new ImportLibrary(builder, filename);
return new SharedLibrary(builder, filename);
+ }
else
return new StaticLibrary(builder, filename);
}
if(++j==cur_names->end())
{
- if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)
+ if(mode==BuildInfo::DYNAMIC && cur_names==&shared_names)
cur_names = &static_names;
else if(mode==BuildInfo::STATIC && cur_names==&static_names)
cur_names = &shared_names;
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)