Don't rely on component type in determining whether to use -fPIC

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index ad06ed89a52e0b23e56401e1c9e414040a6152d6..2246ad4b2d7a5ce97ac35997b951f427ab61982c 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -48,15 +48,17 @@ 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.end(), bi.incpath.begin(), bi.incpath.end());
+       incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
        if(level!=CHAINED)
        {
-               libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-               libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+               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;
+               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;
@@ -83,8 +85,10 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        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("strip",    &BuildInfo::strip);
+       add("sysroot",  &Loader::sysroot);
        add("threads",  &BuildInfo::threads);
        add("warning_level", &BuildInfo::warning_level);
        add("fatal_warnings", &BuildInfo::fatal_warnings);
@@ -115,6 +119,16 @@ void BuildInfo::Loader::library(const string &s)
        obj.libs.push_back(s);
 }
 
+void BuildInfo::Loader::local_incpath(const string &s)
+{
+       obj.local_incpath.push_back(s);
+}
+
+void BuildInfo::Loader::sysroot(const string &s)
+{
+       obj.sysroot = s;
+}
+
 
 void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {