Removed problematic C++ compiler options.