Added back C++ compiler option required by OSX.