Migrate from msppath to mspfs

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index 910387e2299b7c55b1d224b6a1b75853673a40ab..95dfaa64ef6582615a8fe28927d804e855fc614a 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -5,7 +5,8 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 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"
@@ -56,14 +57,14 @@ Link::Link(Builder &b, const Executable &exe):
                else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
                        argv.push_back("-l"+shlib->get_libname());
                else if(dynamic_cast<StaticLibrary *>(tgt))
-                       argv.push_back(relative((*i)->get_name(), work_dir).str());
+                       argv.push_back((*i)->get_name());
                else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(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, work_dir).str());