Skip to content

Commit c517a0a

Browse files
committed
Fix build w/ rtools4
1 parent 797f5d9 commit c517a0a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Makevars.win

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcr
1313
ifeq ($(R_COMPILED_BY),gcc 8.3.0)
1414
GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
1515
else
16+
# Either rtools40 or rtools42 ucrt toolchain is OK
17+
GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
18+
GCCPATH+=:$(R_RTOOLS42_PATH)
1619
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
17-
GCCPATH=$(subst C:\,/c/,$(RTOOLS42_HOME))/x86_64-w64-mingw32.static.posix/bin
1820
endif
1921

2022
all: clean rustup

0 commit comments

Comments
 (0)