Skip to content

Commit c6e8838

Browse files
committed
Auto merge of #1261 - RalfJung:cross-gnu, r=RalfJung
cross-running windows-gnu should now also work Fixes #1198
2 parents a84d8a8 + 8ffbca7 commit c6e8838

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/bin/cargo-miri.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::ops::Not;
66
use std::path::{Path, PathBuf};
77
use std::process::Command;
88

9-
const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 19);
9+
const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 20);
1010

1111
const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri
1212

travis.sh

+2
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,6 @@ if [ "$TRAVIS_OS_NAME" == linux ]; then
4444
elif [ "$TRAVIS_OS_NAME" == osx ]; then
4545
# cross-test 64bit Windows from macOS
4646
MIRI_TEST_TARGET=x86_64-pc-windows-msvc run_tests
47+
# cross-test 32bit GNU Windows from macOS
48+
MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests
4749
fi

0 commit comments

Comments
 (0)