const Architecture &arch = builder.get_current_arch();
- list<string> shared_names;
+ vector<string> shared_names;
bool use_import_lib = false;
if(mode!=BuildInfo::FORCE_STATIC)
{
shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
}
- list<string> static_names;
+ vector<string> static_names;
if(mode!=BuildInfo::FORCE_DYNAMIC)
static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
for(const FS::Path &p: combined_path)
{
- const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
+ const vector<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
for(auto j=cur_names->begin(); j!=cur_names->end(); )
{
FS::Path filename = p / *j;
path.push_back("/");
else
{
- string env_path = Msp::getenv("PATH");
- if(!env_path.empty())
+ if(sys_bin_path.empty())
{
- for(const string &p: split(env_path, ':'))
- path.push_back(p);
- }
- else
- {
- path.push_back("/bin");
- path.push_back("/usr/bin");
+ string env_path = Msp::getenv("PATH");
+ if(!env_path.empty())
+ {
+ for(const string &p: split(env_path, ':'))
+ sys_bin_path.push_back(p);
+ }
+ else
+ {
+ sys_bin_path.push_back("/bin");
+ sys_bin_path.push_back("/usr/bin");
+ }
}
+ path = sys_bin_path;
}
for(const FS::Path &p: path)