BuildInfo::BuildInfo():
libmode(DYNAMIC),
+ rpath_mode(NO_RPATH),
threads(false),
debug(false),
optimize(0),
for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
defines[i->first] = i->second;
incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
+ threads = bi.threads;
+
+ for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
+ {
+ StandardMap::iterator j = standards.find(i->first);
+ if(j==standards.end())
+ standards.insert(*i);
+ else if(i->second.type!=j->second.type || i->second.year!=j->second.year)
+ {
+ if(!i->second.type.compare(0, 3, "gnu"))
+ j->second.type = i->second.type;
+ if(i->second.year>j->second.year)
+ j->second.year = i->second.year;
+ }
+ }
+
if(level!=CHAINED)
{
libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end());
libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end());
}
- threads = bi.threads;
+
if(level==LOCAL)
{
sysroot = bi.sysroot;
local_incpath.insert(local_incpath.begin(), bi.local_incpath.begin(), bi.local_incpath.end());
libmode = bi.libmode;
+ rpath_mode = bi.rpath_mode;
for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
libmodes[i->first] = i->second;
keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
- for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
- standards[i->first] = i->second;
debug = bi.debug;
optimize = bi.optimize;
strip = bi.strip;
}
unique(incpath);
+ unique(local_incpath);
unique(libpath);
unique(libs);
+ unique(keep_symbols);
+}
+
+
+BuildInfo::LanguageStandard::LanguageStandard(const string &std)
+{
+ string::size_type num = string::npos;
+ for(string::size_type i=0; (num==string::npos && i<std.size()); ++i)
+ if(isdigit(static_cast<unsigned char>(std[i])))
+ num = i;
+ type = std.substr(0, num);
+ year = lexical_cast<unsigned>(std.substr(num));
+ year += (year<70 ? 2000 : 1900);
+}
+
+string BuildInfo::LanguageStandard::str() const
+{
+ return format("%s%02d", type, year%100);
}
add("libmode", &Loader::libmode_for_lib);
add("local_incpath", &Loader::local_incpath);
add("optimize", &BuildInfo::optimize);
+ add("runtime_path_mode", &BuildInfo::rpath_mode);
add("standard", &Loader::standard);
add("strip", &BuildInfo::strip);
add("sysroot", &Loader::sysroot);
else
throw lexical_error(format("Conversion of '%s' to LibraryMode", conv.get()));
}
+
+
+void operator>>(const LexicalConverter &conv, BuildInfo::RuntimePathMode &rpath_mode)
+{
+ if(conv.get()=="NONE")
+ rpath_mode = BuildInfo::NO_RPATH;
+ else if(conv.get()=="RELATIVE")
+ rpath_mode = BuildInfo::RELATIVE;
+ else if(conv.get()=="ABSOLUTE")
+ rpath_mode = BuildInfo::ABSOLUTE;
+ else
+ throw lexical_error(format("Conversion of '%s' to RuntimePathMode", conv.get()));
+}