From: Andrea Canciani <ranma42@gmail.com>
Date: Mon, 1 May 2017 23:42:30 +0000 (+0200)
Subject: Fix MacOSX build
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=5e522d73a3664bbfd0ec5a9ad4efee4165c35d37;p=rust.git

Fix MacOSX build

MacOSX does not ship `7z` nor `xz`. Let's use `xz`, just like on the
other *nix systems.
---

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: