about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrea Canciani <ranma42@gmail.com>2017-05-02 01:42:30 +0200
committerAndrea Canciani <ranma42@gmail.com>2017-05-03 08:09:37 +0200
commit5e522d73a3664bbfd0ec5a9ad4efee4165c35d37 (patch)
tree4413d1575cca19f6d1601952e3f6817b5b000891
parent5dfa08ee1be4cf6485ed6ece0c2b08be394ab8c6 (diff)
downloadrust-5e522d73a3664bbfd0ec5a9ad4efee4165c35d37.tar.gz
rust-5e522d73a3664bbfd0ec5a9ad4efee4165c35d37.zip
Fix MacOSX build
MacOSX does not ship `7z` nor `xz`. Let's use `xz`, just like on the
other *nix systems.
-rw-r--r--.travis.yml12
1 files changed, 9 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 5d56379dcce..5c658f3a8b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,7 +95,9 @@ matrix:
         MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
       osx_image: xcode7
-      install: *osx_install_sccache
+      install:
+        - brew update && brew install xz
+        - *osx_install_sccache
     - env: >
         RUST_CHECK_TARGET=dist
         RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"
@@ -106,7 +108,9 @@ matrix:
         MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
       osx_image: xcode7
-      install: *osx_install_sccache
+      install:
+        - brew update && brew install xz
+        - *osx_install_sccache
 
     # "alternate" deployments, these are "nightlies" but don't have assertions
     # turned on, they're deployed to a different location primarily for projects
@@ -123,7 +127,9 @@ matrix:
         MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
       osx_image: xcode7
-      install: *osx_install_sccache
+      install:
+        - brew update && brew install xz
+        - *osx_install_sccache
 
 env:
   global: