#include "builder.h"
#include "component.h"
#include "csourcefile.h"
-#include "externaltask.h"
#include "gnucompiler.h"
#include "objcsourcefile.h"
#include "objectfile.h"
throw invalid_argument("GnuCompiler::GnuCompiler");
set_command((tag=="CXX" ? "g++" : "gcc"), true);
- set_run(_run);
+ set_run_external(_run);
}
Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
void GnuCompiler::do_prepare(ToolData &tool) const
{
+ tool.extra_data = 0U;
prepare_syspath(tool);
prepare_version(tool);
+
+ if(tag=="CXX")
+ tool.build_info.libs.push_back("stdc++");
}
void GnuCompiler::prepare_syspath(ToolData &tool) const
string exe_path = exe->get_path().str();
unsigned version = query_version(exe_path, "-dumpversion");
if(version>=0x70000)
- version = query_version(exe_path, "-dumpfullversion");
+ {
+ unsigned v = query_version(exe_path, "-dumpfullversion");
+ if(v)
+ version = v;
+ }
tool.extra_data = version;
builder.get_logger().log("tools", "%s version is %d.%d.%d", FS::basename(exe->get_path()), version>>16, (version>>8)&0xFF, version&0xFF);
}
argv.push_back(arg);
builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
+ unsigned ver = 0;
try
{
string version_str = strip(ExternalTask::run_and_capture_output(argv));
vector<string> version_parts = split(version_str, '.');
- unsigned ver = 0;
for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
ver |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
- return ver;
}
catch(const runtime_error &)
{ }
- return 0;
+ return ver;
}
-Task *GnuCompiler::_run(const ObjectFile &object)
+ExternalTask::Arguments GnuCompiler::_run(const ObjectFile &object, FS::Path &work_dir)
{
const Tool &tool = *object.get_tool();
const Architecture &arch = *tool.get_architecture();
FS::Path obj_path = object.get_path();
FS::Path src_path = object.get_source().get_path();
- FS::Path work_dir = object.get_component()->get_package().get_source_directory();
argv.push_back("-o");
argv.push_back(relative(obj_path, work_dir).str());
argv.push_back(relative(src_path, work_dir).str());
- return new ExternalTask(argv, work_dir);
+ return argv;
}