X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=63323310c5226d152b2e064b58c1df4ff099069f;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=03429cf8ffa0999723a767bbaf074ead6228a5cc;hpb=398983749391592988daca0c9b62b3d38f86e4e6;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 03429cf..6332331 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -650,7 +650,11 @@ void Builder::Loader::package(const string &n)
 	if(!obj.main_pkg)
 		obj.main_pkg = pkg;
 
-	load_sub(*pkg);
+	if(obj.conf_all || pkg==obj.main_pkg)
+		load_sub(*pkg, obj.cmdline_options);
+	else
+		load_sub(*pkg);
+
 	if(obj.build_type)
 		pkg->set_build_type(*obj.build_type);
 }