Rudimentary support for Debian/Ubuntu multiarch library locations

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index fbb246191af4ad0a6a627dd16e5977df01c6dc20..98f809b2a4ebc379e21d2639f09e936b8c805710 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -161,7 +161,9 @@ bool Architecture::match_name(const string &pattern) const
        for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
                string part = resolve_alias(*i);
-               if(part!=type && part!=cpu && part!=system)
+               if((part=="32" && bits==32) || (part=="64" && bits==64))
+                       ;
+               else if(part!=type && part!=cpu && part!=system)
                        return false;
        }
        return true;