From d86471cb4aa6ce08eb35823ec6b7e2c82658653a Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 17 Sep 2015 17:46:58 -0700
Subject: [PATCH] Only install gcc-multilib when necessary

---
 .travis.yml      | 4 ----
 ci/run-travis.sh | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bda94c10..e34b284c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,10 +34,6 @@ matrix:
     - os: linux
       env: TARGET=aarch64-unknown-linux-gnu
       rust: nightly-2015-09-08
-addons:
-  apt:
-    packages:
-      - gcc-multilib
 notifications:
   email:
     on_success: never
diff --git a/ci/run-travis.sh b/ci/run-travis.sh
index db01aae2..5abf23f8 100644
--- a/ci/run-travis.sh
+++ b/ci/run-travis.sh
@@ -57,6 +57,10 @@ else
 
   # clang has better error messages and implements alignof more broadly
   export CC=clang
+
+  if [ "$TARGET" = "i686-unknown-linux-gnu" ]; then
+    sudo apt-get install gcc-multilib
+  fi
 fi
 
 mkdir .cargo