X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=a416551f23312b74febc418f2c4e41b7f9a5049e;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=8e618deb4ae9de2c78e3d1ec8e169f829652c8c3;hpb=40177b0cfc0d4e67f971941f632e4f1f7e7c3f88;p=builder.git diff --git a/source/architecture.cpp b/source/architecture.cpp index 8e618de..a416551 100644 --- a/source/architecture.cpp +++ b/source/architecture.cpp @@ -122,39 +122,11 @@ Architecture::Architecture(Builder &b, const string &spec): } } -void Architecture::set_tool(const string &t, const string &p) -{ - tools[t] = p; -} - void Architecture::set_cross_prefix(const string &p) { cross_prefix = p; } -std::string Architecture::get_tool(const string &t) const -{ - StringMap::const_iterator i = tools.find(t); - if(i!=tools.end()) - { - if(i->second[0]=='-') - return cross_prefix+i->second; - else - return i->second; - } - - const Architecture &native_arch = builder.get_native_arch(); - if(this!=&native_arch) - { - if(!cross_prefix.empty()) - return cross_prefix+"-"+native_arch.get_tool(t); - else - return native_arch.get_tool(t); - } - else - throw invalid_argument("Unknown tool"); -} - bool Architecture::match_name(const string &pattern) const { vector parts = split(pattern, "-"); @@ -230,10 +202,4 @@ Architecture::Loader::Loader(Architecture &a): arch(a) { add("prefix", &Architecture::cross_prefix); - add("tool", &Loader::tool); -} - -void Architecture::Loader::tool(const string &t, const string &p) -{ - arch.tools[t] = p; }