Pass the option map through load_build_file and to Loader

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index ede0119aeb44dec627cd37d39e14e15ad108420f..21b765bd25f4ef41b139beaa06f3c58671252581 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -92,7 +92,7 @@ Target *GnuLinker::create_install(Target &target) const
                const Tool &copy = builder.get_toolchain().get_tool("CP");
                InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
                if(architecture->get_system()=="windows")
-                       builder.add_installed_target(*shlib->get_import_library());
+                       builder.get_build_graph().add_installed_target(*shlib->get_import_library());
                else
                {
                        const Pattern &pattern = architecture->get_shared_library_patterns().front();
@@ -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;
                }
        }