Merge pull request #504 from nealrichardson/rtools-path

r-lib · Feb 16, 2022 · 761250d · 761250d
2 parents 012150a + 4bb164f
commit 761250d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/setup-r/lib/installer.js b/setup-r/lib/installer.js
@@ -437,6 +437,7 @@ function acquireRtools(version) {
             core.addPath(`C:\\rtools42\\x86_64-w64-mingw32.static.posix\\bin`);
         }
         else if (rtools40) {
+            core.addPath(`C:\\rtools40\\usr\\bin`);
             if (core.getInput("r-version").match("devel")) {
                 core.addPath(`C:\\rtools40\\ucrt64\\bin`);
                 core.exportVariable("_R_INSTALL_TIME_PATCHES_", "no");

diff --git a/setup-r/src/installer.ts b/setup-r/src/installer.ts
@@ -420,10 +420,10 @@ async function acquireRtools(version: string) {
     }
   }
   if (rtools42) {
-      core.addPath(`C:\\rtools42\\usr\\bin`);
-      core.addPath(`C:\\rtools42\\x86_64-w64-mingw32.static.posix\\bin`);
-
+    core.addPath(`C:\\rtools42\\usr\\bin`);
+    core.addPath(`C:\\rtools42\\x86_64-w64-mingw32.static.posix\\bin`);
   } else if (rtools40) {
+    core.addPath(`C:\\rtools40\\usr\\bin`);
     if (core.getInput("r-version").match("devel")) {
       core.addPath(`C:\\rtools40\\ucrt64\\bin`);
       core.exportVariable("_R_INSTALL_TIME_PATCHES_", "no");