diff --git a/appveyor.yml b/appveyor.yml index 71efb3d7791f1..534a8d0cf43e9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,6 +35,7 @@ cache: - llvm-3.9.1-i686-w64-mingw32-juliadeps-r07.7z - llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r07.7z - usr/bin/busybox.exe + - C:\ccache build_script: # If there's a newer build queued for the same PR, cancel this one diff --git a/contrib/windows/appveyor_build.sh b/contrib/windows/appveyor_build.sh index 1040e89aa3356..4b450611244f8 100755 --- a/contrib/windows/appveyor_build.sh +++ b/contrib/windows/appveyor_build.sh @@ -205,6 +205,8 @@ else # Use BinaryBuilder echo 'USE_BINARYBUILDER_LLVM = 1' >> Make.user echo 'override DEP_LIBS += llvm openlibm' >> Make.user + export CCACHE_DIR=/cygdrive/c/ccache + echo 'USECCACHE=1' >> Make.user make check-whitespace make VERBOSE=1 -C base version_git.jl.phony echo 'NO_GIT = 1' >> Make.user @@ -217,3 +219,4 @@ make -j3 VERBOSE=1 install make VERBOSE=1 JULIA=../../usr/bin/julia.exe BIN=. "$(make print-CC)" -C test/embedding release cp usr/bin/busybox.exe julia-*/bin make build-stats +ccache -s diff --git a/contrib/windows/install-cygwin.ps1 b/contrib/windows/install-cygwin.ps1 index 97a5abe35738b..1b117e9b0f099 100644 --- a/contrib/windows/install-cygwin.ps1 +++ b/contrib/windows/install-cygwin.ps1 @@ -5,5 +5,5 @@ mkdir -Force C:\cygdownloads | Out-Null "https://cache.julialang.org/https://cygwin.com/$setup", "C:\cygdownloads\$setup") & "C:\cygdownloads\$setup" -q -n -R C:\cygwin-$env:ARCH ` -l C:\cygdownloads -s http://mirrors.kernel.org/sourceware/cygwin -g -I ` - -P "make,curl,time,p7zip,mingw64-$env:ARCH-gcc-g++,mingw64-$env:ARCH-gcc-fortran" | Where-Object ` + -P "make,curl,time,p7zip,ccache,mingw64-$env:ARCH-gcc-g++,mingw64-$env:ARCH-gcc-fortran" | Where-Object ` -FilterScript {$_ -notlike "Installing file *"} | Write-Output