From c6a6a65062f9e3f01225c836328bfcf95b62356f Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Mon, 12 Mar 2018 00:53:24 -0700 Subject: [PATCH] Touch pcre_h.jl during the build on Windows (#26400) This syncs the modification time, thereby avoiding issues with clock skew while running Make on Windows. Also, make sure we delete a couple of files that shouldn't be there. Fixes #26399 --- contrib/windows/appveyor_build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/windows/appveyor_build.sh b/contrib/windows/appveyor_build.sh index ebadc57c77bdb..63e349cd7ac22 100755 --- a/contrib/windows/appveyor_build.sh +++ b/contrib/windows/appveyor_build.sh @@ -100,6 +100,9 @@ for i in bin/*.dll; do done for i in share/julia/base/pcre_h.jl; do $SEVENZIP e -y julia-installer.exe "$i" -obase >> get-deps.log + # Touch the file to adjust the modification time, thereby (hopefully) avoiding + # issues with clock skew during the build + touch "base/$(basename $i)" done echo "override PCRE_INCL_PATH =" >> Make.user # Remove libjulia.dll if it was copied from downloaded binary @@ -110,6 +113,8 @@ rm -f usr/bin/libgfortran-3.dll rm -f usr/bin/libquadmath-0.dll rm -f usr/bin/libssp-0.dll rm -f usr/bin/libstdc++-6.dll +rm -f usr/bin/libccalltest.dll +rm -f usr/bin/libpthread.dll if [ -z "$USEMSVC" ]; then if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" ]; then