diff --git a/.github/workflows/MkRules.local.in b/.github/workflows/MkRules.local.in index c75453823ae..da10d38679d 100644 --- a/.github/workflows/MkRules.local.in +++ b/.github/workflows/MkRules.local.in @@ -2,7 +2,6 @@ ## Toolchain config WIN = 64 -BINPREF64 = /ucrt64/bin/ # Enable features USE_ICU = YES diff --git a/.github/workflows/rtools40-build.sh b/.github/workflows/rtools40-build.sh index 4b6db79a1d3..3e060c56bcf 100755 --- a/.github/workflows/rtools40-build.sh +++ b/.github/workflows/rtools40-build.sh @@ -11,13 +11,14 @@ set -x srcdir=$(dirname $(realpath $0)) # Put pdflatex on the path (needed only for CMD check) -export PATH="$PATH:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64" +export PATH="/ucrt64/bin:$PATH:$HOME/AppData/Local/Programs/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX/miktex/bin/x64:/c/progra~1/MiKTeX 2.9/miktex/bin/x64" echo "PATH: $PATH" pdflatex --version texindex --version texi2any --version make --version perl --version +gcc --version # Extra steps to prepare SVN build (rather than official tarball) cd "$(cygpath ${GITHUB_WORKSPACE})" diff --git a/.github/workflows/rtools40-installer.sh b/.github/workflows/rtools40-installer.sh index 127e4720e17..3caef7fdf67 100755 --- a/.github/workflows/rtools40-installer.sh +++ b/.github/workflows/rtools40-installer.sh @@ -12,13 +12,14 @@ scripts=$(dirname $(realpath $0)) sources=$(cygpath ${GITHUB_WORKSPACE}) # Put pdflatex on the path (needed only for CMD check) -export PATH="$PATH:/c/progra~1/git/bin:/c/progra~1/MiKTeX/miktex/bin/x64" +export PATH="/ucrt64/bin:$PATH:/c/progra~1/git/bin:/c/progra~1/MiKTeX/miktex/bin/x64" echo "PATH: $PATH" pdflatex --version texindex --version texi2any --version make --version perl --version +gcc --version # Extra steps to prepare SVN build (rather than official tarball) cd "${sources}"