Skip to content

Commit

Permalink
use make from installed mingw on appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
tkelman committed Feb 16, 2015
1 parent a476458 commit d2c1841
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ cache:
- mingw-w64-bin-x86_64-20140102.7z
- llvm-3.3-i686-w64-mingw32-juliadeps.7z
- llvm-3.3-x86_64-w64-mingw32-juliadeps.7z
- make-3.81-2-msys-1.0.11-bin.tar.lzma
- jq.exe

build_script:
Expand Down
8 changes: 8 additions & 0 deletions contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,14 @@ echo "Extracting $f"
$SEVENZIP x -y $f >> get-deps.log
echo 'LLVM_CONFIG = $(JULIAHOME)/usr/bin/llvm-config' >> Make.user

if [ -n "$APPVEYOR" ]; then
for i in make.exe msys-intl-8.dll msys-iconv-2.dll; do
f="/c/MinGW/msys/1.0/bin/$i"
if [ -e $f ]; then
cp $f /bin/$i
fi
done
fi
if [ -z "`which make 2>/dev/null`" ]; then
if [ -n "`uname | grep CYGWIN`" ]; then
echo "Install the Cygwin package for 'make' and try again."
Expand Down

0 comments on commit d2c1841

Please sign in to comment.