From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 12 May 2018 17:20:11 +0000 (-0400)
Subject: meson.eclass: include CFLAGS/CXXFLAGS in c_link_args/cpp_link_args
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8a4a2e00800050a9f236b2834608b725c0e50d32;p=gentoo.git

meson.eclass: include CFLAGS/CXXFLAGS in c_link_args/cpp_link_args
---

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index f493bab2d019..48a39d0fa076 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -167,9 +167,9 @@ _meson_create_cross_file() {
 
 	[properties]
 	c_args = $(_meson_env_array "${CFLAGS}")
-	c_link_args = $(_meson_env_array "${LDFLAGS}")
+	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
 	cpp_args = $(_meson_env_array "${CXXFLAGS}")
-	cpp_link_args = $(_meson_env_array "${LDFLAGS}")
+	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}")