Skip to content

Commit 48032c9

Browse files
committed
Try to build ucrt with rtools40 for backward compatibility
1 parent a172de3 commit 48032c9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v3
3333

34-
- if: runner.os == 'windows' && matrix.config.r == '4.1'
34+
- if: runner.os == 'windows'
3535
uses: r-windows/install-rtools@master
3636

3737
- name: Use precompiled libgifski

src/Makevars.win

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\mingw64\\bin\
1616
export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\\mingw32\\bin\\gcc
1717
else
1818
export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
19+
ifdef RTOOLS40_HOME
20+
GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
21+
else
1922
GCCPATH=$(subst C:\,/c/,$(RTOOLS43_HOME))/x86_64-w64-mingw32.static.posix/bin
2023
endif
24+
endif
2125

2226
all: clean rustup
2327

0 commit comments

Comments
 (0)