Use Clang++ and remove assumption of i686 architecture