#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
#include <msp/io/print.h>
#include <msp/strings/utils.h>
#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;
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;
- 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<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, *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<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)
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));
return tgt;
}
-FileTarget *VirtualFileSystem::get_header(const FS::Path &fn)
+FileTarget *VirtualFileSystem::get_header(const FS::Path &fn, const Tool &tool)
{
- FileTarget *tgt = get_target(fn);
- if(tgt)
+ if(FileTarget *tgt = get_target(fn))
return tgt;
if(FS::is_reg(fn))
- {
- tgt = new CSourceFile(builder, fn);
- return tgt;
- }
+ return dynamic_cast<FileTarget *>(tool.create_source(fn));
+
return 0;
}
{
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;
}
if(FileTarget *tgt = get_target(fn))
return tgt;
else
- return new SystemLibrary(builder, fn.str());
+ return new StaticLibrary(builder, fn);
}
return 0;
projects / builder.git / blobdiff