X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=0e06a5908ff984d1e67def75d64e643106e47ace;hb=6382743d26f8d5bb10a53cb907659bee6614b549;hp=d346fe693299ca520fd658967581514bbb187335;hpb=375526d108ec742a84926e1d458428fd2d0f37f3;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index d346fe6..0e06a59 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -57,10 +57,13 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	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;
 		for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
 			libmodes[i->first] = i->second;
+		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;
@@ -86,7 +89,9 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	add("libmode",  &Loader::libmode_for_lib);
 	add("local_incpath", &Loader::local_incpath);
 	add("optimize", &BuildInfo::optimize);
+	add("standard", &Loader::standard);
 	add("strip",    &BuildInfo::strip);
+	add("sysroot",  &Loader::sysroot);
 	add("threads",  &BuildInfo::threads);
 	add("warning_level", &BuildInfo::warning_level);
 	add("fatal_warnings", &BuildInfo::fatal_warnings);
@@ -122,6 +127,16 @@ void BuildInfo::Loader::local_incpath(const string &s)
 	obj.local_incpath.push_back(s);
 }
 
+void BuildInfo::Loader::standard(DataFile::Symbol tag, const string &std)
+{
+	obj.standards[tag.name] = std;
+}
+
+void BuildInfo::Loader::sysroot(const string &s)
+{
+	obj.sysroot = s;
+}
+
 
 void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {