]> git.tdb.fi Git - builder.git/commitdiff
Pass language standards throuhg ALL dependencies
authorMikko Rasa <tdb@tdb.fi>
Sat, 31 Oct 2015 15:25:45 +0000 (17:25 +0200)
committerMikko Rasa <tdb@tdb.fi>
Sat, 31 Oct 2015 15:25:45 +0000 (17:25 +0200)
Not just direct ones.  I really don't know why I put it in the !=CHAINED
block.

source/buildinfo.cpp

index 8143235380b9ecb81059338066e9032149c1f4d3..0c32ec503ba19579b329e16a031e210620542d5b 100644 (file)
@@ -49,12 +49,12 @@ 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());
                libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end());
-               for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
-                       standards[i->first] = i->second;
        }
        threads = bi.threads;
        if(level==LOCAL)