Use c++ as default CXX rather than g++. (Patch was lost in upgrade to 4.1)
PR: 185436 Approved by: bapt