Skip to content

Commit

Permalink
Touch pcre_h.jl during the build on Windows (JuliaLang#26400)
Browse files Browse the repository at this point in the history
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 JuliaLang#26399
  • Loading branch information
ararslan authored and KristofferC committed Mar 12, 2018
1 parent e81e8f7 commit c6a6a65
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions contrib/windows/appveyor_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit c6a6a65

Please sign in to comment.