X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5a735d09c4e6561484704d33e388906d542e404c;hb=f515e91176cb4fcb1df379cdf664c90b3a565c95;hp=e9d9a700d202d0fcebab400c01df24ca6e5484e5;hpb=d861af0938a9043270245f6973d4ddbdc94e75b4;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index e9d9a70..5a735d0 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -38,6 +38,8 @@ void Component::prepare()
 
 void Component::create_build_info()
 {
+	BuildInfo final_build_info;
+
 	const PackageList &pkg_reqs = package.get_required_packages();
 	PackageList direct_reqs = requires;
 	direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
@@ -48,7 +50,7 @@ void Component::create_build_info()
 		BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
 		if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end())
 			level = BuildInfo::DEPENDENCY;
-		build_info.update_from((*i)->get_exported_build_info(), level);
+		final_build_info.update_from((*i)->get_exported_build_info(), level);
 
 		const PackageList &reqs = (*i)->get_required_packages();
 		for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
@@ -56,13 +58,16 @@ void Component::create_build_info()
 				all_reqs.push_back(*j);
 	}
 
-	build_info.update_from(package.get_build_info());
+	final_build_info.update_from(package.get_build_info());
 
 	for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
 		*i = (package.get_source_directory() / *i).str();
 	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
 		*i = (package.get_source_directory() / *i).str();
 
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
+
 	if(type==LIBRARY || type==MODULE)
 		if(build_info.libmode<BuildInfo::DYNAMIC)
 			build_info.libmode = BuildInfo::DYNAMIC;