Pass language standards throuhg ALL dependencies

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 0e06a5908ff984d1e67def75d64e643106e47ace..0c32ec503ba19579b329e16a031e210620542d5b 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -49,6 +49,8 @@ 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());
+       for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
+               standards[i->first] = i->second;
        if(level!=CHAINED)
        {
                libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end());
@@ -62,8 +64,7 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
                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;
+               keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
                debug = bi.debug;
                optimize = bi.optimize;
                strip = bi.strip;
@@ -83,6 +84,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        add("debug",    &BuildInfo::debug);
        add("define",   &Loader::define);
        add("incpath",  &Loader::incpath);
+       add("keep_symbol", &Loader::keep_symbol);
        add("libpath",  &Loader::libpath);
        add("library",  &Loader::library);
        add("libmode",  &BuildInfo::libmode);
@@ -107,6 +109,11 @@ void BuildInfo::Loader::define(const string &d, const string &v)
        obj.defines[d] = v;
 }
 
+void BuildInfo::Loader::keep_symbol(const string &s)
+{
+       obj.keep_symbols.push_back(s);
+}
+
 void BuildInfo::Loader::libmode_for_lib(const string &l, LibraryMode m)
 {
        obj.libmodes[l] = m;