Update build for 2.11 cross building