aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2024-04-15 19:10:55 +0100
committerDaniel P. Berrangé <berrange@redhat.com>2024-04-16 10:28:32 +0100
commit2f20fa467b11ddb54d9ae3cf63d43d2178e42b80 (patch)
treee0af1cc8bf44fe938179c2d77d35e5259a70e7fc
parentcec67039719becbfbab866f9c23574f389cf9559 (diff)
downloadlibvirt-ci-2f20fa467b11ddb54d9ae3cf63d43d2178e42b80.zip
libvirt-ci-2f20fa467b11ddb54d9ae3cf63d43d2178e42b80.tar.gz
libvirt-ci-2f20fa467b11ddb54d9ae3cf63d43d2178e42b80.tar.bz2
lcitool: don't set rust cross target for non-Debian packages
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é <berrange@redhat.com>
-rw-r--r--lcitool/formatters.py6
1 files 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