Add a list of symbols to keep in the binary to BuildInfo

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 2246ad4b2d7a5ce97ac35997b951f427ab61982c..1d598caa7a42a56178d25cee7b9f35800f903098 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -62,6 +62,9 @@ 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;
+               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;
@@ -81,12 +84,14 @@ 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);
        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);
@@ -104,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;
@@ -124,6 +134,11 @@ 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;