Changed makefile to use environment value of CXX if available