Fix to use CXX environment variable