authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-08-27 01:25:34-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-08-27 01:28:04-04:00
log01f88bf8c658ab6e74d8c3b030b55b17a5048502
tree55fa8726971ff75752a85b5fae8692518864c6eb
parentfedccf9d2d22dba66b7095a6ce5fe6a874f12178

travis again

6 files changed, 26 insertions(+), 7 deletions(-)

ci/travis_linux_before_install+2
......@@ -1,5 +1,7 @@
11#!/bin/sh
22
3set -x
4
35sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" >> /etc/apt/sources.list'
46wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
57sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
ci/travis_linux_install+2
......@@ -1,5 +1,7 @@
11#!/bin/sh
22
3set -x
4
35sudo apt-get remove -y llvm-*
46sudo rm -rf /usr/local/*
57sudo apt-get install -y clang-5.0 libclang-5.0 libclang-5.0-dev llvm-5.0 llvm-5.0-dev liblld-5.0 liblld-5.0-dev cmake
ci/travis_linux_script+2
......@@ -1,5 +1,7 @@
11#!/bin/sh
22
3set -x
4
35export CC=clang-5.0
46export CXX=clang++-5.0
57which $CC
ci/travis_osx_before_install+2
......@@ -1,3 +1,5 @@
11#!/bin/sh
22
3set -x
4
35brew update
ci/travis_osx_install+14-5
......@@ -1,20 +1,29 @@
11#!/bin/sh
22
3set -x
4
35brew install gcc@7
46brew outdated gcc@7 || brew upgrade gcc@7
57brew link --overwrite gcc@7
68
9which gcc
10which g++
11which gcc-7
12which g++-7
13
714SRC_DIR=$(pwd)
815PREFIX_DIR=$SRC_DIR/local
9export CC=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-gcc-7
10export CXX=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-g++-7
16export CC=/usr/local/Cellar/gcc/7.2.0/bin/gcc-7
17export CXX=/usr/local/Cellar/gcc/7.2.0/bin/g++-7
1118
1219wget http://prereleases.llvm.org/5.0.0/rc2/llvm-5.0.0rc2.src.tar.xz
1320wget http://prereleases.llvm.org/5.0.0/rc2/cfe-5.0.0rc2.src.tar.xz
1421wget http://prereleases.llvm.org/5.0.0/rc2/lld-5.0.0rc2.src.tar.xz
1522
23ls -ahl /usr/local/opt
24
1625cd $SRC_DIR
17tar xvf llvm-5.0.0rc2.src.tar.xz
26tar xf llvm-5.0.0rc2.src.tar.xz
1827cd llvm-5.0.0rc2.src
1928mkdir build
2029cd build
......@@ -22,7 +31,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P
2231make install
2332
2433cd $SRC_DIR
25tar xvf lld-5.0.0rc2.src.tar.xz
34tar xf lld-5.0.0rc2.src.tar.xz
2635cd lld-5.0.0rc2.src
2736mkdir build
2837cd build
......@@ -30,7 +39,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P
3039make install
3140
3241cd $SRC_DIR
33tar xvf cfe-5.0.0rc2.src.tar.xz
42tar xf cfe-5.0.0rc2.src.tar.xz
3443cd cfe-5.0.0rc2.src
3544mkdir build
3645cd build
ci/travis_osx_script+4-2
......@@ -1,8 +1,10 @@
11#!/bin/sh
22
3set -x
4
35PREFIX_DIR=$(pwd)/local
4export CC=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-gcc-7
5export CXX=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-g++-7
6export CC=/usr/local/Cellar/gcc/7.2.0/bin/gcc-7
7export CXX=/usr/local/Cellar/gcc/7.2.0/bin/g++-7
68
79echo $PATH
810mkdir build