From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 12 May 2018 17:33:01 +0000 (-0400)
Subject: meson.eclass: include CPPFLAGS in {c,cpp,objc,objcpp}_args
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9400e62868c38e32b59879a8967856fd58c7fc4c;p=gentoo.git

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

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}'