diff options
| author | bors <bors@rust-lang.org> | 2016-04-11 13:28:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-04-11 13:28:36 -0700 |
| commit | 74f8f4ae8836b28456aaf66d0c4e5ff6b123baa0 (patch) | |
| tree | 06c9b301bdcf9aa9763c108a94bd10a24d30879e | |
| parent | b484e6f548058c8297f9c5541b3d42d9d19a7945 (diff) | |
| parent | dfd196efe63cd29c736dfa32dbfb12ae8247044a (diff) | |
| download | rust-libc-74f8f4ae8836b28456aaf66d0c4e5ff6b123baa0.tar.gz | |
Auto merge of #260 - alexcrichton:correctly-gate-travis, r=alexcrichton
Use '&&' on travis, not ';'
Closes #258
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/unix/mod.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 11a830e41f..0d76d4cdcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ script: elif [[ $TRAVIS_RUST_VERSION = "1.0.0" ]]; then cargo build; else - cargo build; - cargo build --no-default-features; + cargo build && + cargo build --no-default-features && rustc ci/style.rs && ./style src; fi os: diff --git a/src/unix/mod.rs b/src/unix/mod.rs index de996b651a..e15eb84fc2 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -156,7 +156,7 @@ cfg_if! { } else if #[cfg(target_os = "emscripten")] { #[link(name = "c")] extern {} - } else if #[cfg(all(target_vendor = "rumprun", target_os = "netbsd"))] { + } else if #[cfg(all(target_os = "netbsd", target_vendor = "rumprun"))] { // Since we don't use -nodefaultlibs on Rumprun, libc is always pulled // in automatically by the linker. We avoid passing it explicitly, as it // causes some versions of binutils to crash with an assertion failure. |