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 627e014
Show file tree
Hide file tree
Showing 14 changed files with 13 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-r02.7z
- x86_64-5.3.0-opensuse-win32-seh-r02.7z
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r07.7z
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r07.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-r02.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-r07.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.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b38f6285b7953a894778580b6c659406
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cd3b9ad3b79702c20323776a9737773ee24fbd5b6ff11a046b462ba7caaefc7d416f52e00dbfbd1494bf8da44c6c4823fd8715b4f27cb62ee40275a072018d6b

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/x86_64-5.3.0-opensuse-win32-seh-r02.7z/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
630a2383bde87e4dedbb63bc7a1207b2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1621a1ea55ed0e08f8771202d949cf7a286742c0ab48d5a9b141e881e54272b57865b4dde448d4a1ae069efc8965fa3e029023d1185fcd4f92eaa462eab091ad

0 comments on commit 627e014

Please sign in to comment.