Update to include CXXFLAGS