clean make patch, add cleanup code to cross_build