Include the toolchain name in project file build commands

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 8bdd1bfe8fceef06070f91c6db73b20111e08b5d..2c5d383ec3622cc25a9caa61b4e4448c41547ea1 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -70,6 +70,7 @@ const char *aliases[] =
 {
        "pc",              "x86",
        "x86_64",          "x86-64",
+       "x64",             "x86-64",
        "amd64",           "x86-64",
        "i586",            "pentium",
        "i686",            "pentiumpro",
@@ -174,11 +175,11 @@ bool Architecture::match_name(const string &pattern) const
        return !negate;
 }
 
-string Architecture::best_match(const list<string> &names) const
+string Architecture::best_match(const vector<string> &names) const
 {
        string best;
        unsigned best_size = 0;
-       for(list<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
+       for(vector<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
                if(match_name(*i))
                {
                        /* TODO Do full parse and alias resolution here?  Otherwise x86 and