Make static library dependencies consistent with what the linker does

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index cd40a853cac56ffe8d06295c4bb9c96650e9c7cf..7088dfb866ce9fe55be1e51024f3cc2aae9db0ba 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -74,11 +74,8 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
                SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
                if(architecture->get_system()=="windows")
                {
-                       ExportDefinitions *exp = new ExportDefinitions(builder, comp, *shlib);
-                       shlib->add_side_effect(*exp);
                        const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
-                       ImportLibrary *imp = dynamic_cast<ImportLibrary *>(dlltool.create_target(*exp));
-                       shlib->set_import_library(imp);
+                       dlltool.create_target(*shlib);
                }
                bin = shlib;
        }
@@ -176,12 +173,6 @@ Task *GnuLinker::Linker::run(const Target &target) const
        {
                argv.push_back("-shared");
                argv.push_back("-fPIC");
-               const Target::Dependencies &side_eff = target.get_side_effects();
-               for(Target::Dependencies::const_iterator i=side_eff.begin(); i!=side_eff.end(); ++i)
-               {
-                       if(ExportDefinitions *exp = dynamic_cast<ExportDefinitions *>(*i))
-                               argv.push_back("-Wl,--output-def,"+relative(exp->get_path(), work_dir).str());
-               }
                if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
                        argv.push_back("-Wl,-soname,"+shlib->get_soname());
        }
@@ -206,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());
@@ -223,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;
                }
        }