]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #38419 - alexcrichton:travis-osx-32-bit, r=brson
authorbors <bors@rust-lang.org>
Sat, 17 Dec 2016 11:10:11 +0000 (11:10 +0000)
committerbors <bors@rust-lang.org>
Sat, 17 Dec 2016 11:10:11 +0000 (11:10 +0000)
travis: Fix testing 32-bit OSX target

We passed --target when we meant to pass --build, meaning we tested only the
standard library for 32-bit, not the whole compiler like we intended.

1  2 
.travis.yml

diff --cc .travis.yml
index 7e5f4b25d2eef505bbb74a28a39cae04423e3831,32ef4e49fc6a1f204bef14aaae3ccc58c2c4f7cf..ea8c94af80b72337e40447c63076401a0dd8153a
@@@ -27,24 -27,22 +27,24 @@@ matrix
      # OSX builders
      - env: >
          RUST_CHECK_TARGET=check
-         RUST_CONFIGURE_ARGS=--target=x86_64-apple-darwin
+         RUST_CONFIGURE_ARGS=--build=x86_64-apple-darwin
          SRC=.
        os: osx
 -      install: brew install ccache
 +      install: &osx_install_sccache >
 +        curl -L https://api.pub.build.mozilla.org/tooltool/sha512/d0025b286468cc5ada83b23d3fafbc936b9f190eaa7d4a981715b18e8e3bf720a7bcee7bfe758cfdeb8268857f6098fd52dcdd8818232692a30ce91039936596 |
 +          tar xJf - -C /usr/local/bin --strip-components=1
      - env: >
          RUST_CHECK_TARGET=check
-         RUST_CONFIGURE_ARGS=--target=i686-apple-darwin
+         RUST_CONFIGURE_ARGS=--build=i686-apple-darwin
          SRC=.
        os: osx
 -      install: brew install ccache
 +      install: *osx_install_sccache
      - env: >
          RUST_CHECK_TARGET=check
-         RUST_CONFIGURE_ARGS=--target=x86_64-apple-darwin --disable-rustbuild
+         RUST_CONFIGURE_ARGS=--build=x86_64-apple-darwin --disable-rustbuild
          SRC=.
        os: osx
 -      install: brew install ccache
 +      install: *osx_install_sccache
      - env: >
          RUST_CHECK_TARGET=
          RUST_CONFIGURE_ARGS=--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios