drop the runner env var once entering wine

in order to not use wine again when launching a new binary

Author: glehmann

ci/test.sh

@@ -259,7 +259,7 @@ fn main() {
     } else {
         vec![]
     };
-    let executable = "/target/${TARGET}/debug/foo";
+    let executable = format!("/target/${TARGET}/debug/foo{}", std::env::consts::EXE_SUFFIX);
     command.push(executable.to_string());
     let status = dbg!(std::process::Command::new(&command[0])
         .args(&command[1..])

docker/Dockerfile.i686-pc-windows-gnu

@@ -43,7 +43,7 @@ COPY toolchain.cmake /opt/toolchain.cmake
 ENV CROSS_TOOLCHAIN_PREFIX=i686-w64-mingw32-
 ENV CROSS_TOOLCHAIN_SUFFIX=-posix
 ENV CROSS_SYSROOT=/usr/i686-w64-mingw32
-ENV CROSS_TARGET_RUNNER="wine"
+ENV CROSS_TARGET_RUNNER="env -u CARGO_TARGET_I686_PC_WINDOWS_GNU_RUNNER wine"
 ENV CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc"$CROSS_TOOLCHAIN_SUFFIX" \
     CARGO_TARGET_I686_PC_WINDOWS_GNU_RUNNER="$CROSS_TARGET_RUNNER" \
     AR_i686_pc_windows_gnu="$CROSS_TOOLCHAIN_PREFIX"ar \

docker/Dockerfile.x86_64-pc-windows-gnu

@@ -41,7 +41,7 @@ COPY toolchain.cmake /opt/toolchain.cmake
 ENV CROSS_TOOLCHAIN_PREFIX=x86_64-w64-mingw32-
 ENV CROSS_TOOLCHAIN_SUFFIX=-posix
 ENV CROSS_SYSROOT=/usr/x86_64-w64-mingw32
-ENV CROSS_TARGET_RUNNER="wine"
+ENV CROSS_TARGET_RUNNER="env -u CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER wine"
 ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc"$CROSS_TOOLCHAIN_SUFFIX" \
     CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER="$CROSS_TARGET_RUNNER" \
     AR_x86_64_pc_windows_gnu="$CROSS_TOOLCHAIN_PREFIX"ar \