From 9400e62868c38e32b59879a8967856fd58c7fc4c Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 12 May 2018 13:33:01 -0400 Subject: [PATCH] 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 48a39d0fa076..731177e7fbf6 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}' -- 2.26.2