Get build working on xctool