Cleanups

Author: jeroen

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

@@ -31,6 +31,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - if: runner.os == 'windows' && matrix.config.r == '4.1'
+        uses: r-windows/install-rtools@master
+
       - name: Use precompiled libgifski
         if: runner.os == 'Windows' && matrix.config.static
         run: Copy-Item src\Makevars.win.static src\Makevars.win

src/Makevars.win

@@ -10,12 +10,11 @@ PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcr
 
 # This bypasses the exception stuff
 #export CARGO_TARGET_I686_PC_WINDOWS_GNU_RUSTFLAGS=-C panic=abort
+export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
 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=$(R_RTOOLS42_PATH):$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
-export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
+GCCPATH=$(subst C:\,/c/,$(RTOOLS43_HOME))/x86_64-w64-mingw32.static.posix/bin
 endif
 
 all: clean rustup
@@ -27,6 +26,7 @@ ifeq ($(WIN),64) #hack for mxe-rtools42
 	mkdir -p myrustlib/target/release/deps; echo '!<arch>' > myrustlib/target/release/deps/libgcc_eh.a
 endif
 	PATH="$(GCCPATH):$(USERPROFILE)\.cargo:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
+	rm -Rf $(LIBDIR)/build
 
 clean:
 	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target