Update the build system for the new setup; also allow either clang or g++ (preferring clang where available)