Adjust requires to library changes

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index db8bd11db0b3c832790d3cbdbef4d2f717ad80fd..e632937775abc1b73f3c2a798b21c2eda8a20443 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -1,5 +1,4 @@
 #include <iostream>
-#include <msp/algo.h>
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
@@ -27,7 +26,7 @@ Finds and adds any required libraries to the dependencies.
 void Executable::find_depends()
 {
        LibMode libmode=package->get_library_mode();
-       
+
        list<const Component *> queue;
        list<Target *> dep_libs;
        queue.push_back(&comp);
@@ -35,17 +34,17 @@ void Executable::find_depends()
        {
                const Component *c=queue.front();
                queue.erase(queue.begin());
-               
+
+               const StringList &libpath=c->get_build_info().libpath;
+               const string &arch=c->get_package().get_arch();
+
                const list<string> &libs=c->get_build_info().libs;
                for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
-                       Target *lib=builder.get_library(*i, c->get_build_info().libpath, libmode);
+                       Target *lib=builder.get_library(*i, arch, libpath, libmode);
                        if(lib)
                        {
-                               if(contains(depends, lib))
-                                       continue;
-
-                               dep_libs.push_front(lib);
+                               dep_libs.push_back(lib);
 
                                if(dynamic_cast<Install *>(lib))
                                        lib=lib->get_depends().front();
@@ -58,8 +57,16 @@ void Executable::find_depends()
                }
        }
 
+       /* Add only the last occurrence of each library to the actual dependencies.
+       This ensures that static library ordering is correct. */
        for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
-               add_depend(*i);
+       {
+               bool last=true;
+               for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
+                       last=(j==i || *j!=*i);
+               if(last)
+                       add_depend(*i);
+       }
 
        deps_ready=true;
 }