From 7fa6534858ccc512b2d6b9acc88db1aa2d26e587 Mon Sep 17 00:00:00 2001 From: gnzlbg <gonzalobg88@gmail.com> Date: Fri, 5 Jul 2019 18:08:56 +0200 Subject: [PATCH] Fix FreeBSD and Appveyor --- appveyor.yml | 1 + libc-test/build.rs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b14230a0..0efc9af3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,7 @@ install: - rustup-init.exe -y --default-host %TARGET% - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin + - if defined MSYS2_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib" - rustc -V - cargo -V diff --git a/libc-test/build.rs b/libc-test/build.rs index 555aee30..7006c03b 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -473,6 +473,11 @@ fn test_windows(target: &str) { } }); + cfg.skip_roundtrip(move |s| match s { + "dirent" | "statfs" | "utsname" | "utmpx" => true, + _ => false, + }); + cfg.generate("../src/lib.rs", "main.rs"); } @@ -1641,6 +1646,11 @@ fn test_freebsd(target: &str) { (struct_ == "sigaction" && field == "sa_sigaction") }); + cfg.skip_roundtrip(move |s| match s { + "dirent" | "statfs" | "utsname" | "utmpx" => true, + _ => false, + }); + cfg.generate("../src/lib.rs", "main.rs"); } -- GitLab