[Olena-patches] 690: Fix CXXFLAGS usage.