From c517a0a1278389d32216c00fc46d2fb335b64c09 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 1 Aug 2022 10:41:22 +0200
Subject: [PATCH] Fix build w/ rtools4

---
 src/Makevars.win | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makevars.win b/src/Makevars.win
index 251836d..b33a4ef 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -13,8 +13,10 @@ PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcr
 ifeq ($(R_COMPILED_BY),gcc 8.3.0)
 GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
 else
+# Either rtools40 or rtools42 ucrt toolchain is OK
+GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
+GCCPATH+=:$(R_RTOOLS42_PATH)
 export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
-GCCPATH=$(subst C:\,/c/,$(RTOOLS42_HOME))/x86_64-w64-mingw32.static.posix/bin
 endif
 
 all: clean rustup