X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcomponent.cpp;h=93d450b4a47372297e6da6c797006837b4c4e277;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=708293e7575da7e4ef67ca3e9fc0217f9ea7ab7a;hpb=f2b26f1929a8209a746bcf4944165b0ba9ef303f;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 708293e..93d450b 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -66,7 +66,11 @@ void Component::create_build_info()
 	for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
 		*i = (pkg.get_source() / *i).str();
 
-	if(pkg.get_library_mode()!=DYNAMIC)
+	if(type==LIBRARY || type==MODULE)
+		if(build_info.libmode<BuildInfo::DYNAMIC)
+			build_info.libmode = BuildInfo::DYNAMIC;
+
+	if(build_info.libmode<BuildInfo::DYNAMIC)
 	{
 		for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 		{
@@ -74,9 +78,6 @@ void Component::create_build_info()
 			build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
 		}
 	}
-
-	if(type==PROGRAM)
-		build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
 }
 
 void Component::create_targets() const
@@ -222,6 +223,7 @@ PathList Component::collect_source_files() const
 		FS::Path path(*i);
 		if(FS::is_dir(path))
 		{
+			pkg.get_builder().get_logger().log("files", format("Traversing %s", path));
 			list<string> sfiles = list_files(path);
 			for(list<string>::iterator j=sfiles.begin(); j!=sfiles.end(); ++j)
 				files.push_back(path / *j);