Further changes for library compatibility

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index e82b65aaecb77048b126261c5a2cb6a444d3d24d..59dc1f9d190991a4bf5fbbfd9f7761515f932aff 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -6,7 +6,7 @@ Distributed under the LGPL
 */
 
 #include <msp/fs/utils.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
@@ -53,13 +53,12 @@ void Binary::find_depends()
                        {
                                dep_libs.push_back(lib);
 
-                               if(Install *inst = dynamic_cast<Install *>(lib))
-                                       lib = &inst->get_source();
+                               lib = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
                                        queue.push_back(&stlib->get_component());
                        }
                        else
-                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, FS::basename(name)));
+                               builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, name));
                }
        }