Support source generators that combine multiple files into one

[builder.git] / source / tool.cpp

diff --git a/source/tool.cpp b/source/tool.cpp
index abded33f7aba8131d1f64d8b6c050a3da1e7d504..e2afe79a204ccea8aebda5294c0dc8a0fd3f583e 100644 (file)
--- 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));
+}