Support for multi arch builds