Changes to make a standard crossbuild work, rather than OpenClovis customized crossbuild