From 6796f477aaa8e61f3c429a6ad7db8b61926caeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sat, 20 Aug 2022 18:47:22 +0200
Subject: [PATCH 1/2] fix wrong usage of bool_from_envvar

---
 src/bin/cross.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/cross.rs b/src/bin/cross.rs
index b98579a2c..921068335 100644
--- a/src/bin/cross.rs
+++ b/src/bin/cross.rs
@@ -19,7 +19,9 @@ pub fn main() -> cross::Result<()> {
     let args = cli::parse(&target_list)?;
     let subcommand = args.subcommand;
     let mut msg_info = shell::MessageInfo::create(
-        args.verbose + cross::config::bool_from_envvar("CROSS_DEBUG") as u8,
+        args.verbose
+            + cross::config::bool_from_envvar(&std::env::var("CROSS_DEBUG").unwrap_or_default())
+                as u8,
         args.quiet,
         args.color.as_deref(),
     )?;

From 33ee9403c891417fdcd08110e094e2eb3581b61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sat, 20 Aug 2022 19:27:24 +0200
Subject: [PATCH 2/2] copy kvm

---
 docker/dragonfly.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/dragonfly.sh b/docker/dragonfly.sh
index 241ed80c3..1644ecbee 100755
--- a/docker/dragonfly.sh
+++ b/docker/dragonfly.sh
@@ -72,7 +72,7 @@ EOF
     cp "${td}/dragonfly/usr/lib/libexecinfo.so.1" "${destdir}/lib"
     cp "${td}/dragonfly/usr/lib/libpthread.so" "${destdir}/lib/libpthread.so"
     cp "${td}/dragonfly/usr/lib/librt.so.0" "${destdir}/lib"
-    cp "${td}"/dragonfly/usr/lib/lib{c,m,util}.a "${destdir}/lib"
+    cp "${td}"/dragonfly/usr/lib/lib{c,m,util,kvm}.a "${destdir}/lib"
     cp "${td}/dragonfly/usr/lib/thread/libthread_xu.so.2" "${destdir}/lib/libpthread.so.0"
     cp "${td}"/dragonfly/usr/lib/{crt1,Scrt1,crti,crtn}.o "${destdir}/lib/"