updated how to handle CXXFLAGS