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

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 44d4d6255fe1c2d57caea506e6d00809d7fce541..efa20efea3a6af31b9003a99396ac66be018f992 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -21,6 +21,8 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 {
        const Component &comp=obj.get_component();
 
+       work_dir=comp.get_package().get_source();
+
        const TargetList &deps=obj.get_depends();
        Path spath=deps.front()->get_name();
 
@@ -31,7 +33,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        else
                tool="CC";
 
-       argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
+       argv.push_back(builder.get_current_arch().get_tool(tool));
        argv.push_back("-c");
 
        const BuildInfo &binfo=comp.get_build_info();
@@ -44,13 +46,13 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 
        Path opath=obj.get_name();
        argv.push_back("-o");
-       argv.push_back(opath.str());
-       argv.push_back(spath.str());
+       argv.push_back(relative(opath, work_dir).str());
+       argv.push_back(relative(spath, work_dir).str());
 
        if(!builder.get_dry_run())
                mkpath(opath.subpath(0, opath.size()-1), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(opath, comp.get_package().get_source()).str());
+       announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str());
 
        launch();
 }