X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=af4865498c5fd61c2105d987f783ff23d21d5466;hb=32d6218afe58969f2b18dfa6e262bb9509829abe;hp=0c32ec503ba19579b329e16a031e210620542d5b;hpb=7b006cb1156e08e89c830c4480401d88258ce02e;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 0c32ec5..af48654 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -28,6 +28,7 @@ void unique(list<T> &l)
 
 BuildInfo::BuildInfo():
 	libmode(DYNAMIC),
+	rpath_mode(NO_RPATH),
 	threads(false),
 	debug(false),
 	optimize(0),
@@ -49,19 +50,34 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	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)
-		standards[i->first] = i->second;
+	{
+		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());
@@ -73,8 +89,27 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	}
 
 	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);
 }
 
 
@@ -91,6 +126,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	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);
@@ -158,3 +194,16 @@ void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 	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()));
+}