summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-03-04 11:19:19 -0800
committerMatt Turner <mattst88@gentoo.org>2020-03-08 17:15:04 -0700
commitb8d0ccd69d3b71e73c9ccef7c213c0c135ea3abd (patch)
tree330c59db7a794a491bc5b1f9cebacc7424632767 /eclass/meson.eclass
parentx11-base/xorg-server: Drop old versions (diff)
downloadgentoo-b8d0ccd69d3b71e73c9ccef7c213c0c135ea3abd.tar.gz
gentoo-b8d0ccd69d3b71e73c9ccef7c213c0c135ea3abd.tar.bz2
gentoo-b8d0ccd69d3b71e73c9ccef7c213c0c135ea3abd.zip
meson.eclass: Set needs_exe_wrapper in cross file
needs_exe_wrapper tells meson whether the build machine is able to directly execute the binaries it produces or whether it needs an exe wrapper (like QEMU). For non-native ABI builds like building 32-bit libraries on an x86-64 system, we want this set to false to communicate to meson that the build machine can run the binaries directly. Reviewed-by: Mike Gilbert <floppym@gentoo.org> Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'eclass/meson.eclass')
-rw-r--r--eclass/meson.eclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 0588590b31e1..16e17dd4a384 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -149,6 +149,9 @@ _meson_create_cross_file() {
# This may require adjustment based on CFLAGS
local cpu=${CHOST%%-*}
+ local needs_exe_wrapper=false
+ tc-is-cross-compiler && needs_exe_wrapper=true
+
cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF
[binaries]
ar = $(_meson_env_array "$(tc-getAR)")
@@ -173,6 +176,7 @@ _meson_create_cross_file() {
objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
+ needs_exe_wrapper = ${needs_exe_wrapper}
[host_machine]
system = '${system}'