Improve use statement handling

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index ede0119aeb44dec627cd37d39e14e15ad108420f..7088dfb866ce9fe55be1e51024f3cc2aae9db0ba 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -197,12 +197,13 @@ Task *GnuLinker::Linker::run(const Target &target) const
        const Target::Dependencies &depends = target.get_dependencies();
        for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
        {
+               FileTarget *file = dynamic_cast<FileTarget *>(*i);
                Target *tgt = (*i)->get_real_target();
 
                if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
                        argv.push_back(relative(obj->get_path(), work_dir).str());
                else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
-                       argv.push_back(stlib->get_path().str());
+                       argv.push_back((file?file:stlib)->get_path().str());
                else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
                {
                        argv.push_back("-l"+shlib->get_libname());
@@ -214,7 +215,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
                        if(shlib)
                                argv.push_back("-l"+shlib->get_libname());
                        else
-                               argv.push_back(imp->get_path().str());
+                               argv.push_back((file?file:imp)->get_path().str());
                        static_link_ok = false;
                }
        }