Minor cleanup to the BuildInfo class

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 0c32ec503ba19579b329e16a031e210620542d5b..114a368ecc96feabec39807621d1dc0d1a363e85 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -49,14 +49,16 @@ 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;
+
        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;
@@ -73,8 +75,10 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
        }
 
        unique(incpath);
+       unique(local_incpath);
        unique(libpath);
        unique(libs);
+       unique(keep_symbols);
 }