Adjust requires to library changes

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 3f4ba2019f32a835449d72ce336f0f08076573d7..02f1ba5cb653aa558cbbb304e9d88d92df5ccfdc 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,4 +1,3 @@
-#include <msp/algo.h>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
@@ -65,11 +64,14 @@ void ObjectFile::find_depends(Target *tgt)
        if(!src)
                return;
 
+       const string &arch=comp.get_package().get_arch();
+       const StringList &incpath=comp.get_build_info().incpath;
+
        const list<string> &includes=src->get_includes();
        for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr2=builder.get_header(*i, path, comp.get_build_info().incpath);
-               if(hdr2 && !contains(depends, hdr2))
+               Target *hdr2=builder.get_header(*i, arch, path, incpath);
+               if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
                        add_depend(hdr2);
        }
 }