[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     9400e62868c38e32b59879a8967856fd58c7fc4c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May 12 17:33:01 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu May 24 04:46:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9400e628

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

 eclass/meson.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 48a39d0fa07..731177e7fbf 100644
--- 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}'