Use package directory as work dir for ExternalActions and make filename arguments...

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index a7ea2c55df4374fc1149fedc0b4eaf4dc922785b..910387e2299b7c55b1d224b6a1b75853673a40ab 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -25,9 +25,12 @@ Link::Link(Builder &b, const Executable &exe):
 {
        const Component &comp=exe.get_component();
 
+       work_dir=comp.get_package().get_source();
+
        //XXX Determine whether to use g++ or gcc
-       argv.push_back(builder.get_tool("LDXX", comp.get_package().get_arch()));
-       
+       string tool="LXX";
+       argv.push_back(builder.get_current_arch().get_tool(tool));
+
        if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
                argv.push_back("-shared");
        else if(comp.get_package().get_library_mode()==ALL_STATIC)
@@ -38,9 +41,9 @@ Link::Link(Builder &b, const Executable &exe):
                argv.push_back(*i);
        for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
                argv.push_back("-L"+*i);
-       
+
        argv.push_back("-o");
-       argv.push_back(exe.get_name());
+       argv.push_back(relative(exe.get_name(), work_dir).str());
        const TargetList &deps=exe.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
@@ -49,20 +52,20 @@ Link::Link(Builder &b, const Executable &exe):
                        tgt=tgt->get_depends().front();
 
                if(dynamic_cast<ObjectFile *>(tgt))
-                       argv.push_back((*i)->get_name());
+                       argv.push_back(relative((*i)->get_name(), work_dir).str());
                else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
                        argv.push_back("-l"+shlib->get_libname());
                else if(dynamic_cast<StaticLibrary *>(tgt))
-                       argv.push_back((*i)->get_name());
+                       argv.push_back(relative((*i)->get_name(), work_dir).str());
                else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
                        argv.push_back("-l"+syslib->get_libname());
        }
 
-       Path::Path epath=exe.get_name();
+       Path epath=exe.get_name();
        if(!builder.get_dry_run())
-               Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+               mkpath(epath.subpath(0, epath.size()-1), 0755);
 
-       announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());
+       announce(comp.get_package().get_name(), tool, relative(epath, work_dir).str());
 
        launch();
 }