Merge #997

997: fix wrong usage of bool_from_envvar r=Alexhuszagh a=Emilgardis

fixes #996 

Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

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/"
 

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(),
     )?;