Skip to content

Commit

Permalink
Download opensuse toolchain on appveyor
Browse files Browse the repository at this point in the history
and rebuild llvm binaries with it
  • Loading branch information
tkelman committed Feb 29, 2016
1 parent 06ccf7f commit af523d1
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 20 deletions.
9 changes: 4 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ init:
- git config --global core.autocrlf input

cache:
# Cache any downloads from sourceforge because it's really unreliable
- i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z
- x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z
- i686-5.3.0-opensuse-win32-sjlj.7z
- x86_64-5.3.0-opensuse-win32-seh.7z
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z

build_script:
# If there's a newer build queued for the same PR, cancel this one
Expand Down
12 changes: 5 additions & 7 deletions contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,18 +109,16 @@ rm -f usr/bin/libjulia-debug.dll

if [ -z "$USEMSVC" ]; then
if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" -o -n "$APPVEYOR" ]; then
f=$ARCH-4.9.2-release-win32-$exc-rt_v4-rev3.7z
f=$ARCH-5.3.0-opensuse-win32-$exc.7z
checksum_download \
"$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
echo "Extracting $f"
$SEVENZIP x -y $f >> get-deps.log
export PATH=$PWD/mingw$bits/bin:$PATH
# If there is a version of make.exe here, it is mingw32-make which won't work
rm -f mingw$bits/bin/make.exe
export PATH=$PWD/usr/$ARCH-w64-mingw32/sys-root/mingw/bin:$PATH
fi
export AR=${CROSS_COMPILE}ar

f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r04.7z
f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r06.7z
else
echo "override USEMSVC = 1" >> Make.user
echo "override ARCH = $ARCH" >> Make.user
Expand All @@ -140,8 +138,8 @@ checksum_download \
"$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
echo "Extracting $f"
$SEVENZIP x -y $f >> get-deps.log
echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/tools/llvm-config.exe' >> Make.user
echo 'override LLVM_SIZE := $(JULIAHOME)/usr/tools/llvm-size.exe' >> Make.user
echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/bin/llvm-config.exe' >> Make.user
echo 'override LLVM_SIZE := $(JULIAHOME)/usr/bin/llvm-size.exe' >> Make.user

if [ -z "`which make 2>/dev/null`" ]; then
if [ -n "`uname | grep CYGWIN`" ]; then
Expand Down

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d1910b6cfd1872de99b88759ddc72e2e
1 change: 1 addition & 0 deletions deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
04da25abd98437392354664e6228af37ee63deddcb71367526ca3df6356d801d3ab0e47aacacb3e5d22d696d5032fa8ce321b34cfa79908e191a6c4bf2150cae

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
98324dd5062410e5418df8249776cf64
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a3d1cd86f6e032d0a88c84058c6dafa0ed12286d9cc8edad084f670a3d5e299228214409fa716e53e58bc4d47742a37996652a1907d8e60cf0e9c22721a83574

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b9bebde989cc5b2ee0655d9be22975ae
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f985ab65d9c77dbe0ef31f7fa4961a9b0a8c64bc1c3dc033090be2be1d2e91e6f35dceb8abcd13369e9a4e2f243add8e1d4ebaa1ff8ea74db32824bbd8c8618a

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1d895dab2e6afc6e0dfe14fbe4291de4
1 change: 1 addition & 0 deletions deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/sha512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cb06c7b217f71556d3ec459a0ae2529e18f33787b0d4392f87d5f33aae0a3e503af0b0e0180edcc34580436f12481e983b018341c83bff29aa4381724972ecc1

0 comments on commit af523d1

Please sign in to comment.