meson.eclass: include CPPFLAGS in {c,cpp,objc,objcpp}_args

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 48a39d0fa07673b99f4a3583ff9282ca1cf770d6..731177e7fbf691d8b3dbd99871082daa20bbb581 100644 (file)
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -166,13 +166,13 @@ _meson_create_cross_file() {
        strip = '$(tc-getSTRIP)'
 
        [properties]
-       c_args = $(_meson_env_array "${CFLAGS}")
+       c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
        c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
-       cpp_args = $(_meson_env_array "${CXXFLAGS}")
+       cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
        cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}")
        fortran_args = $(_meson_env_array "${FCFLAGS}")
-       objc_args = $(_meson_env_array "${OBJCFLAGS}")
-       objcpp_args = $(_meson_env_array "${OBJCXXFLAGS}")
+       objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
+       objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
 
        [host_machine]
        system = '${system}'