Use build info to store static library dependencies

[builder.git] / source / binarypackage.cpp

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index 679fb636132127ab39195a101e2ce93204277d2a..bed4c90b9875e63331f6676ab51ade95b767977e 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -4,6 +4,7 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "filetarget.h"
+#include "staticlibrary.h"
 
 using namespace std;
 using namespace Msp;
@@ -96,20 +97,13 @@ void BinaryPackage::do_prepare()
 
        if(!static_binfo.libs.empty())
        {
-               BuildInfo::PathList combined_libpath = static_binfo.libpath;
-               combined_libpath.insert(combined_libpath.end(), export_binfo.libpath.begin(), export_binfo.libpath.end());
-
-               Target::Dependencies static_dep_libs;
-               for(BuildInfo::WordList::const_iterator i=static_binfo.libs.begin(); i!=static_binfo.libs.end(); ++i)
-                       if(Target *lib = builder.get_vfs().find_library(*i, combined_libpath, BuildInfo::STATIC, system))
-                               static_dep_libs.push_back(lib);
-
                for(BuildInfo::WordList::const_iterator i=export_binfo.libs.begin(); i!=export_binfo.libs.end(); ++i)
                        if(Target *lib = builder.get_vfs().find_library(*i, export_binfo.libpath, BuildInfo::FORCE_STATIC, system))
-                       {
-                               for(Target::Dependencies::const_iterator j=static_dep_libs.begin(); j!=static_dep_libs.end(); ++j)
-                                       lib->add_transitive_dependency(**j);
-                       }
+                               if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
+                               {
+                                       for(BuildInfo::WordList::const_iterator j=static_binfo.libs.begin(); j!=static_binfo.libs.end(); ++j)
+                                               stlib->add_required_library(*j);
+                               }
        }
 }