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

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 321b954d4e96c59bbbdb9ae845465853a6e7da54..0536755bb26788354d5e147e021f38fe64d0af36 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -11,7 +11,8 @@ using namespace Msp;
 
 ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
        FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
-       source(s)       
+       source(s),
+       used_in_shlib(false)
 {
        component = &c;
        add_dependency(source);
@@ -20,7 +21,12 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path &src)
 {
        const SourcePackage &pkg = comp.get_package();
-       FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+       FS::Path temp_dir = pkg.get_temp_directory()/comp.get_name();
+       FS::Path rel_src;
+       if(FS::descendant_depth(src, temp_dir)>=0)
+               rel_src = FS::relative(src, temp_dir);
+       else
+               rel_src = FS::relative(src, pkg.get_source_directory());
        string fn;
        for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
        {
@@ -29,7 +35,18 @@ FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path
                if(*i!=".")
                        fn += *i;
        }
-       return pkg.get_temp_directory()/comp.get_name()/(FS::basepart(fn)+".o");
+       return temp_dir/(FS::basepart(fn)+".o");
+}
+
+void ObjectFile::set_used_in_shared_library(bool u)
+{
+       used_in_shlib = u;
+}
+
+void ObjectFile::collect_build_info(BuildInfo &binfo) const
+{
+       Target::collect_build_info(binfo);
+       binfo.update_from(component->get_build_info_for_path(source.get_path()));
 }
 
 void ObjectFile::find_dependencies()
@@ -44,7 +61,7 @@ void ObjectFile::find_dependencies()
 void ObjectFile::find_dependencies(FileTarget *tgt)
 {
        FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
-       const Dependencies &tdeps = rtgt->get_dependencies();
+       const Dependencies &tdeps = rtgt->get_transitive_dependencies();
        Dependencies deps_to_add;
        if(rtgt==tgt)
        {
@@ -86,5 +103,9 @@ void ObjectFile::find_dependencies(FileTarget *tgt)
 
        for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
                if(find(depends.begin(), depends.end(), *i)==depends.end())
+               {
                        add_dependency(**i);
+                       if((*i)->get_real_target()->is_buildable())
+                               (*i)->signal_modified.connect(sigc::mem_fun(this, static_cast<void (ObjectFile::*)()>(&ObjectFile::find_dependencies)));
+               }
 }