Get rid of the install flags, which weren't entirely correct anyway

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index df6eda42fcfe535f2074b1939b5a0c6afe677782..d93bd0aff646a4d2c5b428e5557ad39dc14fc906 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -392,13 +392,13 @@ int Builder::create_targets()
        Target *world = new VirtualTarget(*this, "world");
 
        Target *def_tgt = new VirtualTarget(*this, "default");
-       world->add_depend(def_tgt);
+       world->add_depend(*def_tgt);
 
        Target *install = new VirtualTarget(*this, "install");
-       world->add_depend(install);
+       world->add_depend(*install);
 
        Target *tarballs = new VirtualTarget(*this, "tarballs");
-       world->add_depend(tarballs);
+       world->add_depend(*tarballs);
 
        const PackageManager::PackageMap &packages = package_manager.get_packages();
        for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
@@ -420,7 +420,7 @@ int Builder::create_targets()
                        return -1;
                }
 
-               cmdline->add_depend(tgt);
+               cmdline->add_depend(*tgt);
        }
 
        cmdline->prepare();
@@ -444,9 +444,11 @@ int Builder::create_targets()
                                i->second->force_rebuild();
        }
 
-       for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-               if(SourcePackage *spkg = dynamic_cast<SourcePackage *>(i->second))
-                       spkg->get_deps_cache().save();
+       if(!dry_run)
+       {
+               for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+                       i->second->save_caches();
+       }
 
        return 0;
 }