fix compiler warnings from gcc4.8, specify g++ as compiler (undoing the earlier edit to use the CXX env var)