From 2f20fa467b11ddb54d9ae3cf63d43d2178e42b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 15 Apr 2024 19:10:55 +0100 Subject: lcitool: don't set rust cross target for non-Debian packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can't do alternative rust cross build targets for Fedora with mingw, so we should limit this logic to Debian packages only. Signed-off-by: Daniel P. Berrangé --- lcitool/formatters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lcitool/formatters.py b/lcitool/formatters.py index f057e2f..8b953e3 100644 --- a/lcitool/formatters.py +++ b/lcitool/formatters.py @@ -112,8 +112,8 @@ class Formatter(metaclass=abc.ABCMeta): cross_arch_deb = util.native_arch_to_deb_arch(target.cross_arch) varmap["cross_arch_deb"] = cross_arch_deb - if "rust" in varmap["mappings"]: - varmap["cross_rust_target"] = util.native_arch_to_rust_target(varmap["cross_arch"]) + if "rust" in varmap["mappings"]: + varmap["cross_rust_target"] = util.native_arch_to_rust_target(varmap["cross_arch"]) log.debug(f"Generated varmap: {varmap}") return varmap @@ -444,7 +444,7 @@ class BuildEnvFormatter(Formatter): else: env["MESON_OPTS"] = "--cross-file=" + varmap["cross_abi"] - if "rust" in varmap["mappings"]: + if varmap["cross_rust_target"] is not None: env["RUST_TARGET"] = varmap["cross_rust_target"] return env -- cgit v1.1