Move to native make builds