From 0af5e2312bf9d0aa150f787c77c333b2da2cbfdb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 30 Nov 2015 15:07:28 -0800 Subject: Check in Cargo.lock for libc-test This should help the repo be resilient to ctest changes upstream. --- libc-test/Cargo.lock | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ libc-test/build.rs | 8 ++++ 2 files changed, 121 insertions(+) create mode 100644 libc-test/Cargo.lock diff --git a/libc-test/Cargo.lock b/libc-test/Cargo.lock new file mode 100644 index 0000000000..4d851de678 --- /dev/null +++ b/libc-test/Cargo.lock @@ -0,0 +1,113 @@ +[root] +name = "libc-test" +version = "0.1.0" +dependencies = [ + "ctest 0.1.0 (git+https://github.com/alexcrichton/ctest)", + "libc 0.2.2", +] + +[[package]] +name = "advapi32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "ctest" +version = "0.1.0" +source = "git+https://github.com/alexcrichton/ctest#4b29e7d8cf64370a3e38c9a2f31fc577a953689b" +dependencies = [ + "gcc 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gcc" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "libc" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libc" +version = "0.2.2" + +[[package]] +name = "libc" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "log" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustc-serialize" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "syntex_syntax" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "term" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "unicode-xid" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + diff --git a/libc-test/build.rs b/libc-test/build.rs index a693b0d9f2..3a2b861179 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -276,5 +276,13 @@ fn main() { (musl && struct_ == "glob_t" && field == "gl_flags") }); + cfg.fn_cname(move |a, b| { + if windows || android { + b.unwrap_or(a).to_string() + } else { + a.to_string() + } + }); + cfg.generate("../src/lib.rs", "all.rs"); } -- cgit v1.2.1