]> git.tdb.fi Git - builder.git/blobdiff - source/compile.cpp
Use package directory as work dir for ExternalActions and make filename arguments...
[builder.git] / source / compile.cpp
index 61b17ad90807c65b0c85c649fbabe7c31a5cc6cc..efa20efea3a6af31b9003a99396ac66be018f992 100644 (file)
@@ -21,17 +21,19 @@ 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::Path spath=deps.front()->get_name();
+       Path spath=deps.front()->get_name();
 
-       string ext=Path::splitext(spath.str()).ext;
+       string ext=splitext(spath.str()).ext;
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
                tool="CXX";
        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();
@@ -42,15 +44,15 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                argv.push_back("-D"+*i);
 
-       Path::Path opath=obj.get_name();
+       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())
-               Path::mkpath(opath.subpath(0, opath.size()-1), 0755);
+               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();
 }