X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=8196ef7f2c39ac5d1c2da5d3f4c998debcde7484;hb=84b614a344280bb5cd2aa87bfb8c874d131c4c85;hp=732fe142400f72159f2f800407c16d6287fce10d;hpb=3f0f7216789aeedba206308c452623351e406e75;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 732fe14..8196ef7 100644
--- 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,7 @@ 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 temp_dir = pkg.get_temp_directory()/comp.get_name();
+	FS::Path temp_dir = pkg.get_temp_directory();
 	FS::Path rel_src;
 	if(FS::descendant_depth(src, temp_dir)>=0)
 		rel_src = FS::relative(src, temp_dir);
@@ -34,7 +35,13 @@ FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path
 		if(*i!=".")
 			fn += *i;
 	}
-	return temp_dir/(FS::basepart(fn)+".o");
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return temp_dir/comp.get_name()/arch.create_filename<ObjectFile>(FS::basepart(fn));
+}
+
+void ObjectFile::set_used_in_shared_library(bool u)
+{
+	used_in_shlib = u;
 }
 
 void ObjectFile::collect_build_info(BuildInfo &binfo) const
@@ -65,6 +72,7 @@ void ObjectFile::find_dependencies(FileTarget *tgt)
 	}
 	else
 	{
+		FS::Path inst_dir = rtgt->get_component()->get_install_map().get_install_location(*rtgt);
 		/* The target has been displaced by installing it.  Displace any
 		dependencies that come from the same package as well. */
 		const SourcePackage *tpkg = rtgt->get_package();
@@ -73,12 +81,13 @@ void ObjectFile::find_dependencies(FileTarget *tgt)
 			FileTarget *file = dynamic_cast<FileTarget *>(*i);
 			if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
 			{
-				FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
+				const Component *tcomp = file->get_component();
+				FS::Path dep_inst = tcomp->get_install_map().get_install_location(*file);
+				FS::Path displaced = FS::dirname(tgt->get_path())/FS::relative(dep_inst, inst_dir)/FS::basename(file->get_path());
 				if(Target *ddep = builder.get_vfs().get_target(displaced))
 					deps_to_add.push_back(ddep);
 				else
 				{
-					const Component *tcomp = file->get_component();
 					const Component::OverlayList &overlays = tcomp->get_overlays();
 					string last_dir = FS::basename(FS::dirname(displaced));
 					for(Component::OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)