Made makefile honor $CXX environment variable, and fixed build error related to "make build" target.