Distributed under the LGPL
*/
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
#include "builder.h"
#include "component.h"
#include "executable.h"
{
const Component &comp=exe.get_component();
+ work_dir=comp.get_package().get_source();
+
//XXX Determine whether to use g++ or gcc
string tool="LXX";
- argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
+ 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");
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)
{
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("-l"+syslib->get_libname());
}
- Path epath=exe.get_name();
+ FS::Path epath=exe.get_name();
if(!builder.get_dry_run())
- mkpath(epath.subpath(0, epath.size()-1), 0755);
+ FS::mkpath(FS::dirname(epath), 0755);
- announce(comp.get_package().get_name(), tool, relative(epath, comp.get_package().get_source()).str());
+ announce(comp.get_package().get_name(), tool, relative(epath, work_dir).str());
launch();
}