simplify CXXFLAGS handling