Support specifying library modes on a per-library basis

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index d56ab17b0b59020ae30dc2825654d6c186b485b9..5856c19e539bde29901e7d7ba0fdfcf1247e2077 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -31,8 +31,6 @@ void Binary::find_dependencies()
        if(!component)
                return;
 
-       BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
-
        list<const Component *> queue;
        list<Target *> dep_libs;
        queue.push_back(component);
@@ -44,6 +42,7 @@ void Binary::find_dependencies()
                const BuildInfo &binfo = c->get_build_info();
                for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                {
+                       BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
                        Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
                        if(lib)
                        {