Make build CPU detection a tad more flexible