DVJS-65 - Modified the Makefile to do conditional assignments based on the environment.  Changed CC_PLUSS to CXX which aligns with bitbake