Merge pull request ocaml#6926 from hannesm/remove-gcc-hack

now that we're on trusty, no need anymore for this hack!
mlasson · Jul 6, 2016 · 82e1b8c · 82e1b8c
2 parents 7777dd4 + a4b4240
commit 82e1b8c
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -104,20 +104,6 @@ function build_one {
       fi
   else
     echo "... package available."
-    case $TRAVIS_OS_NAME in
-        linux)
-            # we need fresh gcc and binutils, maybe...
-            # this can soon be removed, once travis upgraded their infrastructure
-            if [ `opam install --dry-run $pkg | grep -c mirage-entropy-xen` -gt 0 ] ; then
-                echo "installing a recent gcc and binutils (mainly to get mirage-entropy-xen working\!)"
-                sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
-                sudo apt-get -qq update
-                sudo apt-get install -y gcc-4.8
-                sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90
-                wget http://mirrors.kernel.org/ubuntu/pool/main/b/binutils/binutils_2.24-5ubuntu3.1_amd64.deb
-                sudo dpkg -i binutils_2.24-5ubuntu3.1_amd64.deb
-            fi
-    esac
     echo
     echo "====== External dependency handling ======"
     opam install depext