diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 67b7ca831fd2e..7e17c3bd65437 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -120,7 +120,7 @@ _meson_env_array() { # @FUNCTION: _meson_get_machine_info # @USAGE: -# @RETURN: system/cpu_family/cpu variables +# @RETURN: system/cpu_family/cpu/builtin_options variables # @INTERNAL # @DESCRIPTION: # Translate toolchain tuple into machine values for meson. @@ -146,6 +146,17 @@ _meson_get_machine_info() { # This may require adjustment based on CFLAGS cpu=${tuple%%-*} + + local ver_opt + case "${EAPI}" in + 6) ver_opt=--host-route ;; + *) ver_opt=-b ;; + esac + if has_version "${ver_opt}" ' "${fn}" <<-EOF [binaries] ar = $(_meson_env_array "$(tc-getBUILD_AR)") @@ -225,7 +235,7 @@ _meson_create_native_file() { strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") - [properties] + ${builtin_options} c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")