Evaluate conditions at load time to allow more flexibility

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 03429cf8ffa0999723a767bbaf074ead6228a5cc..63323310c5226d152b2e064b58c1df4ff099069f 100644 (file)
--- 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);
 }