Skip to content

Commit af523d1

Browse files
committed
Download opensuse toolchain on appveyor
and rebuild llvm binaries with it
1 parent 06ccf7f commit af523d1

File tree

18 files changed

+17
-20
lines changed

18 files changed

+17
-20
lines changed

appveyor.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ init:
2929
- git config --global core.autocrlf input
3030

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

3837
build_script:
3938
# If there's a newer build queued for the same PR, cancel this one

contrib/windows/msys_build.sh

+5-7
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,16 @@ rm -f usr/bin/libjulia-debug.dll
109109

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

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

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

deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/md5

-1
This file was deleted.

deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/sha512

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d1910b6cfd1872de99b88759ddc72e2e
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
04da25abd98437392354664e6228af37ee63deddcb71367526ca3df6356d801d3ab0e47aacacb3e5d22d696d5032fa8ce321b34cfa79908e191a6c4bf2150cae

deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5

-1
This file was deleted.

deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
98324dd5062410e5418df8249776cf64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a3d1cd86f6e032d0a88c84058c6dafa0ed12286d9cc8edad084f670a3d5e299228214409fa716e53e58bc4d47742a37996652a1907d8e60cf0e9c22721a83574

deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5

-1
This file was deleted.

deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b9bebde989cc5b2ee0655d9be22975ae
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f985ab65d9c77dbe0ef31f7fa4961a9b0a8c64bc1c3dc033090be2be1d2e91e6f35dceb8abcd13369e9a4e2f243add8e1d4ebaa1ff8ea74db32824bbd8c8618a

deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/md5

-1
This file was deleted.

deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/sha512

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1d895dab2e6afc6e0dfe14fbe4291de4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cb06c7b217f71556d3ec459a0ae2529e18f33787b0d4392f87d5f33aae0a3e503af0b0e0180edcc34580436f12481e983b018341c83bff29aa4381724972ecc1

0 commit comments

Comments
 (0)