Fix build w/ rtools4

r-rust · Aug 1, 2022 · c517a0a · c517a0a
1 parent 797f5d9
commit c517a0a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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