X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=efa20efea3a6af31b9003a99396ac66be018f992;hb=4c11e2a041d2064f44b7eb3dbf1976c35fc8881c;hp=d07f3ef4ee3255cbef1d1299a72c13dffad8db00;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index d07f3ef..efa20ef 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -21,19 +21,21 @@ 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_tool(tool, comp.get_package().get_arch()));
+	argv.push_back(builder.get_current_arch().get_tool(tool));
 	argv.push_back("-c");
-	
+
 	const BuildInfo &binfo=comp.get_build_info();
 	for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
 		argv.push_back(*i);
@@ -41,16 +43,16 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 		argv.push_back("-I"+*i);
 	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();
 }