Commit 01f88bf8c658ab6e74d8c3b030b55b17a5048502 | zig

author	Andrew Kelley <andrew@ziglang.org> 2017-08-27 01:25:34-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2017-08-27 01:28:04-04:00
log	01f88bf8c658ab6e74d8c3b030b55b17a5048502
tree	55fa8726971ff75752a85b5fae8692518864c6eb
parent	fedccf9d2d22dba66b7095a6ce5fe6a874f12178

travis again

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

ci/travis_linux_before_install+2

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2		2
		3	set -x
		4
3	sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" >> /etc/apt/sources.list'	5	sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" >> /etc/apt/sources.list'
4	wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key\|sudo apt-key add -	6	wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key\|sudo apt-key add -
5	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test	7	sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test

ci/travis_linux_install+2

...	@@ -1,5 +1,7 @@	...	@@ -1,5 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2		2
		3	set -x
		4
3	sudo apt-get remove -y llvm-*	5	sudo apt-get remove -y llvm-*
4	sudo rm -rf /usr/local/*	6	sudo rm -rf /usr/local/*
5	sudo 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	7	sudo 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 @@	...	@@ -1,5 +1,7 @@
1	#!/bin/sh	1	#!/bin/sh
2		2
		3	set -x
		4
3	export CC=clang-5.0	5	export CC=clang-5.0
4	export CXX=clang++-5.0	6	export CXX=clang++-5.0
5	which $CC	7	which $CC

ci/travis_osx_before_install+2

...	@@ -1,3 +1,5 @@	...	@@ -1,3 +1,5 @@
1	#!/bin/sh	1	#!/bin/sh
2		2
		3	set -x
		4
3	brew update	5	brew update

ci/travis_osx_install+14-5

...	@@ -1,20 +1,29 @@	...	@@ -1,20 +1,29 @@
1	#!/bin/sh	1	#!/bin/sh
2		2
		3	set -x
		4
3	brew install gcc@7	5	brew install gcc@7
4	brew outdated gcc@7 \|\| brew upgrade gcc@7	6	brew outdated gcc@7 \|\| brew upgrade gcc@7
5	brew link --overwrite gcc@7	7	brew link --overwrite gcc@7
6		8
		9	which gcc
		10	which g++
		11	which gcc-7
		12	which g++-7
		13
7	SRC_DIR=$(pwd)	14	SRC_DIR=$(pwd)
8	PREFIX_DIR=$SRC_DIR/local	15	PREFIX_DIR=$SRC_DIR/local
9	export CC=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-gcc-7	16	export CC=/usr/local/Cellar/gcc/7.2.0/bin/gcc-7
10	export CXX=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-g++-7	17	export CXX=/usr/local/Cellar/gcc/7.2.0/bin/g++-7
11		18
12	wget http://prereleases.llvm.org/5.0.0/rc2/llvm-5.0.0rc2.src.tar.xz	19	wget http://prereleases.llvm.org/5.0.0/rc2/llvm-5.0.0rc2.src.tar.xz
13	wget http://prereleases.llvm.org/5.0.0/rc2/cfe-5.0.0rc2.src.tar.xz	20	wget http://prereleases.llvm.org/5.0.0/rc2/cfe-5.0.0rc2.src.tar.xz
14	wget http://prereleases.llvm.org/5.0.0/rc2/lld-5.0.0rc2.src.tar.xz	21	wget http://prereleases.llvm.org/5.0.0/rc2/lld-5.0.0rc2.src.tar.xz
15		22
		23	ls -ahl /usr/local/opt
		24
16	cd $SRC_DIR	25	cd $SRC_DIR
17	tar xvf llvm-5.0.0rc2.src.tar.xz	26	tar xf llvm-5.0.0rc2.src.tar.xz
18	cd llvm-5.0.0rc2.src	27	cd llvm-5.0.0rc2.src
19	mkdir build	28	mkdir build
20	cd build	29	cd build
...	@@ -22,7 +31,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P	...	@@ -22,7 +31,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P
22	make install	31	make install
23		32
24	cd $SRC_DIR	33	cd $SRC_DIR
25	tar xvf lld-5.0.0rc2.src.tar.xz	34	tar xf lld-5.0.0rc2.src.tar.xz
26	cd lld-5.0.0rc2.src	35	cd lld-5.0.0rc2.src
27	mkdir build	36	mkdir build
28	cd build	37	cd build
...	@@ -30,7 +39,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P	...	@@ -30,7 +39,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_P
30	make install	39	make install
31		40
32	cd $SRC_DIR	41	cd $SRC_DIR
33	tar xvf cfe-5.0.0rc2.src.tar.xz	42	tar xf cfe-5.0.0rc2.src.tar.xz
34	cd cfe-5.0.0rc2.src	43	cd cfe-5.0.0rc2.src
35	mkdir build	44	mkdir build
36	cd build	45	cd build

ci/travis_osx_script+4-2

 @@ -1,8 +1,10 @@
 #!/bin/sh
+set -x
 PREFIX_DIR=$(pwd)/local
-export CC=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-gcc-7
+export CC=/usr/local/Cellar/gcc/7.2.0/bin/gcc-7
-export CXX=/usr/local/opt/gcc/bin/$(uname -m)-apple-darwin$(uname -r)-g++-7
+export CXX=/usr/local/Cellar/gcc/7.2.0/bin/g++-7
 echo $PATH
 mkdir build