Fix several uninitialized variables
{
const Component &comp=lib.get_component();
{
const Component &comp=lib.get_component();
- const string &prefix=b.get_arch_prefix(lib.get_package()->get_arch());
-
- argv.push_back(prefix+"ar");
+ argv.push_back(builder.get_tool("AR", lib.get_package()->get_arch()));
argv.push_back("rc");
argv.push_back(lib.get_name());
argv.push_back("rc");
argv.push_back(lib.get_name());
Builder::Builder(int argc, char **argv):
analyzer(0),
do_build(false),
Builder::Builder(int argc, char **argv):
analyzer(0),
do_build(false),
+ dry_run(false),
+ help(false),
verbose(1),
chrome(false),
build_file("Build"),
verbose(1),
chrome(false),
build_file("Build"),
+ jobs(1),
+ conf_all(false),
+ conf_only(false),
+ build_all(false)
{
string analyze_mode;
string work_dir;
{
string analyze_mode;
string work_dir;
archs.insert(StringMap::value_type("native", ""));
archs.insert(StringMap::value_type("arm", "arm-linux-gnu-"));
archs.insert(StringMap::value_type("win32", "i586-mingw32msvc-"));
archs.insert(StringMap::value_type("native", ""));
archs.insert(StringMap::value_type("arm", "arm-linux-gnu-"));
archs.insert(StringMap::value_type("win32", "i586-mingw32msvc-"));
+
+ StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second;
+ native_tools.insert(StringMap::value_type("CC", "gcc"));
+ native_tools.insert(StringMap::value_type("CXX", "g++"));
+ native_tools.insert(StringMap::value_type("LD", "gcc"));
+ native_tools.insert(StringMap::value_type("LDXX", "g++"));
+ native_tools.insert(StringMap::value_type("AR", "ar"));
+string Builder::get_tool(const std::string &tool, const std::string &arch)
+{
+ ToolMap::iterator i=tools.find(arch);
+ if(i!=tools.end())
+ {
+ StringMap::iterator j=i->second.find(tool);
+ if(j!=i->second.end())
+ return j->second;
+ }
+
+ // Either the arch, or the tool within the arch was not found
+ i=tools.find("native");
+ StringMap::iterator j=i->second.find(tool);
+ if(j==i->second.end())
+ throw InvalidParameterValue("Unknown tool");
+
+ return get_arch_prefix(arch)+j->second;
+}
+
int Builder::main()
{
if(load_build_file(cwd/build_file))
int Builder::main()
{
if(load_build_file(cwd/build_file))
Target *get_library(const std::string &, const StringList &, LibMode);
const Msp::Path::Path &get_cwd() const { return cwd; }
const std::string &get_arch_prefix(const std::string &) const;
Target *get_library(const std::string &, const StringList &, LibMode);
const Msp::Path::Path &get_cwd() const { return cwd; }
const std::string &get_arch_prefix(const std::string &) const;
+ std::string get_tool(const std::string &, const std::string &);
typedef std::list<Package *> PackageList;
typedef std::map<std::string, Package *> PackageMap;
typedef std::map<std::string, Target *> TargetMap;
typedef std::list<Package *> PackageList;
typedef std::map<std::string, Package *> PackageMap;
typedef std::map<std::string, Target *> TargetMap;
- typedef std::map<std::string, std::string> ToolMap;
+ typedef std::map<std::string, StringMap> ToolMap;
StringList cmdline_targets;
RawOptionMap cmdline_options;
StringList cmdline_targets;
RawOptionMap cmdline_options;
TargetMap libraries;
ToolMap tools; /// Not used yet
TargetMap libraries;
ToolMap tools; /// Not used yet
- StringMap archs; /// arch -> prefix
+ StringMap archs; //< arch -> prefix
Analyzer *analyzer;
bool do_build;
Analyzer *analyzer;
bool do_build;
const TargetList &deps=obj.get_depends();
Path::Path spath=deps.front()->get_name();
const TargetList &deps=obj.get_depends();
Path::Path spath=deps.front()->get_name();
- const string &prefix=b.get_arch_prefix(obj.get_package()->get_arch());
-
string ext=Path::splitext(spath.str()).ext;
const char *tool=0;
if(ext==".cpp" || ext==".cc")
string ext=Path::splitext(spath.str()).ext;
const char *tool=0;
if(ext==".cpp" || ext==".cc")
- argv.push_back(prefix+"g++");
- }
- argv.push_back(prefix+"gcc");
- }
+
+ argv.push_back(builder.get_tool(tool, obj.get_package()->get_arch()));
argv.push_back("-c");
const BuildInfo &binfo=comp.get_build_info();
argv.push_back("-c");
const BuildInfo &binfo=comp.get_build_info();
{
const Component &comp=exe.get_component();
{
const Component &comp=exe.get_component();
- const string &prefix=b.get_arch_prefix(exe.get_package()->get_arch());
-
//XXX Determine whether to use g++ or gcc
//XXX Determine whether to use g++ or gcc
- argv.push_back(prefix+"g++");
+ argv.push_back(builder.get_tool("LDXX", exe.get_package()->get_arch()));
if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
argv.push_back("-shared");
if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
argv.push_back("-shared");
Package::Package(Builder &b, const string &n, const vector<string> &info):
builder(b),
name(n),
Package::Package(Builder &b, const string &n, const vector<string> &info):
builder(b),
name(n),
+ buildable(false),
+ conf_done(false)
{
for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
{
{
for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
{
if(lexical_cast<unsigned>(optimize))
{
build_info.cflags.push_back("-O"+optimize);
if(lexical_cast<unsigned>(optimize))
{
build_info.cflags.push_back("-O"+optimize);
+ build_info.ldflags.push_back("-O"+optimize);
string cpu=config.get_option("cpu").value;
if(cpu!="auto")
build_info.cflags.push_back("-march="+cpu);
string cpu=config.get_option("cpu").value;
if(cpu!="auto")
build_info.cflags.push_back("-march="+cpu);