Cleaned up the build process for the external constraint solver.