X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftool.cpp;h=e2afe79a204ccea8aebda5294c0dc8a0fd3f583e;hb=4e2a160d94ca808cfb511cc2d38e115d989809f2;hp=abded33f7aba8131d1f64d8b6c050a3da1e7d504;hpb=e516e78510ad455eebc0e06645c9f12943117525;p=builder.git

diff --git a/source/tool.cpp b/source/tool.cpp
index abded33..e2afe79 100644
--- a/source/tool.cpp
+++ b/source/tool.cpp
@@ -12,6 +12,7 @@ Tool::Tool(Builder &b, const string &t):
 	architecture(0),
 	tag(t),
 	executable(0),
+	processing_unit(ONE_FILE),
 	prepared(false)
 { }
 
@@ -20,6 +21,7 @@ Tool::Tool(Builder &b, const Architecture &a, const string &t):
 	architecture(&a),
 	tag(t),
 	executable(0),
+	processing_unit(ONE_FILE),
 	prepared(false)
 { }
 
@@ -28,7 +30,7 @@ void Tool::set_command(const string &cmd, bool cross)
 	if(cmd.empty())
 		throw invalid_argument("Tool::set_command");
 
-	if(cross && architecture->is_cross())
+	if(cross && architecture->is_cross() && !FS::Path(cmd).is_absolute())
 		command = format("%s-%s", architecture->get_cross_prefix(), cmd);
 	else
 		command = cmd;
@@ -71,3 +73,17 @@ SubTool::SubTool(Tool &p):
 	Tool(p),
 	parent(p)
 { }
+
+
+void operator>>(const LexicalConverter &conv, Tool::ProcessingUnit &unit)
+{
+	const string &str = conv.get();
+	if(str=="FILE")
+		unit = Tool::ONE_FILE;
+	else if(str=="DIRECTORY")
+		unit = Tool::DIRECTORY;
+	else if(str=="COMPONENT")
+		unit = Tool::COMPONENT;
+	else
+		throw lexical_error(format("conversion of '%s' to ProcessingUnit", str));
+}