Compile on chcpu2. 

At least on chcpu2, these changes are needed for successfully building.  Would you test them on your server?