Windows: build without binpref

r-devel · Dec 18, 2021 · ff4f472 · ff4f472
1 parent 30e8b92
commit ff4f472
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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}"