X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobjectfile.cpp;h=8196ef7f2c39ac5d1c2da5d3f4c998debcde7484;hb=b5a0caaec5b617ecccda6dc116da076eaf662f4e;hp=ab10c6113eb4ab367bd3636ba15691e276005b2c;hpb=76ede1d44e68182a2380260c22ec7be68c9817af;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index ab10c61..8196ef7 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -21,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);
@@ -36,7 +36,7 @@ FS::Path ObjectFile::generate_target_path(const Component &comp, const FS::Path
 			fn += *i;
 	}
 	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-	return temp_dir/arch.get_object_patterns().front().apply(FS::basepart(fn));
+	return temp_dir/comp.get_name()/arch.create_filename<ObjectFile>(FS::basepart(fn));
 }
 
 void ObjectFile::set_used_in_shared_library(bool u)