diff options
| author |   David Michael <david.michael@coreos.com> | 2017-10-13 12:21:01 -0700 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2017-10-24 22:39:22 -0400 |
| commit | 12c1af25e48b57a7f67979fada914a377969e848 (patch) | |
| tree | df282c524e52e051a73cb5fbdea71f35f0f06d0e /eclass | |
| parent | net-analyzer/hexinject: Respect CFLAGS (diff) | |
| download | gentoo-12c1af25e48b57a7f67979fada914a377969e848.tar.gz gentoo-12c1af25e48b57a7f67979fada914a377969e848.tar.bz2 gentoo-12c1af25e48b57a7f67979fada914a377969e848.zip | |
meson.eclass: include pkg-config in the cross file
This fixes cross-compiling current systemd.
Signed-off-by: David Michael <david.michael@coreos.com>
Closes: https://bugs.gentoo.org/635354
Closes: https://github.com/gentoo/gentoo/pull/5940
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/meson.eclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index b339017f9017..be1055a3fe57 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -125,6 +125,7 @@ _meson_create_cross_file() { ar = '${AR}' c = '${CC}' cpp = '${CXX}' + pkgconfig = '${PKG_CONFIG}' strip = '${STRIP}' [host_machine] @@ -155,6 +156,7 @@ meson_src_configure() { local -x AR=$(tc-getAR) local -x CC=$(tc-getCC) local -x CXX=$(tc-getCXX) + local -x PKG_CONFIG=$(tc-getPKG_CONFIG) local -x STRIP=$(tc-getSTRIP) if tc-is-cross-compiler; then @@ -166,6 +168,7 @@ meson_src_configure() { AR=$(tc-getBUILD_AR) CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) + PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG) STRIP=$(tc-getBUILD_STRIP) fi |