Remove automatic export/import of symbols from GNU tools on Windows

[builder.git] / plugins / gnu / mingwdlltool.cpp

diff --git a/plugins/gnu/mingwdlltool.cpp b/plugins/gnu/mingwdlltool.cpp
index c5ffdf5939b9a1b01aeaf88b24a5efd867e055a4..a3fdadbe3d8bb64e40b870d8b0efc22d7407d78b 100644 (file)
--- a/plugins/gnu/mingwdlltool.cpp
+++ b/plugins/gnu/mingwdlltool.cpp
@@ -37,27 +37,13 @@ Target *MingwDllTool::create_target(const vector<Target *> &sources, const strin
        ExportDefinitions *exp = new ExportDefinitions(builder, *shlib.get_component(), objs);
        exp->set_tool(*this);
 
-       ImportLibrary *imp = new ImportLibrary(builder, *shlib.get_component(), shlib, *exp);
+       ImportLibrary *imp = new ImportLibrary(builder, *shlib.get_component(), shlib);
+       imp->add_dependency(*exp);
        imp->set_tool(*this);
 
        return imp;
 }
 
-Target *MingwDllTool::create_install(Target &target) const
-{
-       if(ImportLibrary *imp = dynamic_cast<ImportLibrary *>(&target))
-       {
-               Tool &copy = builder.get_toolchain().get_tool("CP");
-               InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
-               string link_name = format("lib%s.dll.a", imp->get_shared_library()->get_libname());
-               if(link_name!=FS::basename(inst_tgt->get_path()))
-                       inst_tgt->set_symlink(link_name);
-               return inst_tgt;
-       }
-       else
-               return 0;
-}
-
 Task *MingwDllTool::_run(const Target &target)
 {
        const Tool &tool = *target.get_tool();
@@ -93,10 +79,7 @@ Task *MingwDllTool::_run(const Target &target)
                argv.push_back(relative(exp->get_path(), work_dir).str());
 
                argv.push_back("-D");
-               if(shlib.get_install_filename().empty())
-                       argv.push_back(FS::basename(shlib.get_path()));
-               else
-                       argv.push_back(shlib.get_install_filename());
+               argv.push_back(FS::basename(shlib.get_path()));
 
                argv.push_back("-l");
                argv.push_back(relative(imp->get_path(), work_dir).str());
@@ -107,9 +90,6 @@ Task *MingwDllTool::_run(const Target &target)
                        if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
                                argv.push_back(relative(obj->get_path(), work_dir).str());
 
-               // XXX Should use dllexport, but that has some other problems to solve
-               argv.push_back("--export-all-symbols");
-
                argv.push_back("-z");
                argv.push_back(relative(exp->get_path(), work_dir).str());
        }