MB-11060:  fixup looking for matching ARCHITECTURE

Change-Id: I7916fdebd350689e675c8806b96700cf9a9525df
Reviewed-on: http://review.couchbase.org/41832
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>