I think it should now be possible to remove this. C++ is now *the* boot language for gcc. So by that measure it *must* be automatically enabled in bootstrapped builds. Let me test...