Toolchain path

Author: andrjohns

R/install.R

@@ -556,7 +556,7 @@ install_toolchain <- function(quiet = FALSE) {
   rtools_usr_bin <- file.path(rtools4x_home_path(), "usr", "bin")
   rtools_version <- paste0("Rtools", rtools4x_version())
   if (is_ucrt_toolchain()) {
-    install_pkgs <- c("mingw-w64-ucrt-x86_64-make", "mingw-w64-ucrt-x86_64-gcc")
+    install_pkgs <- c("mingw-w64-ucrt-x86_64-make")
     if (!quiet) message(paste0("Installing mingw32-make and g++ with ", rtools_version))
   } else {
     install_pkgs <- "mingw-w64-x86_64-make"
@@ -618,6 +618,7 @@ check_rtools4x_windows_toolchain <- function(fix = FALSE, quiet = FALSE) {
   rtools_path <- rtools_home_path()
   rtools_version <- paste0("Rtools", rtools4x_version())
   toolchain_path <- rtools4x_toolchain_path()
+  make_path <- rtools_make_path()
   # If RTOOLS4X_HOME is not set (the env. variable gets set on install)
   # we assume that RTools 40 is not installed.
   if (!nzchar(rtools_path)) {
@@ -638,7 +639,7 @@ check_rtools4x_windows_toolchain <- function(fix = FALSE, quiet = FALSE) {
     )
   }
   if (!is_toolchain_installed(app = "g++", path = toolchain_path) ||
-      !is_toolchain_installed(app = "mingw32-make", path = toolchain_path)) {
+      !is_toolchain_installed(app = "mingw32-make", path = make_path)) {
     if (!fix) {
       stop(
         "\n", rtools_version, " installation found but the toolchain was not installed.",
@@ -648,7 +649,7 @@ check_rtools4x_windows_toolchain <- function(fix = FALSE, quiet = FALSE) {
     } else {
       install_toolchain(quiet = quiet)
       if (!is_toolchain_installed(app = "g++", path = toolchain_path) ||
-          !is_toolchain_installed(app = "mingw32-make", path = toolchain_path)) {
+          !is_toolchain_installed(app = "mingw32-make", path = make_path)) {
         stop(
           "\nInstallation of the toolchain failed. Try reinstalling RTools and trying again.",
           "\nIf the issue persists, open a bug report at https://github.com/stan-dev/cmdstanr.",
@@ -845,6 +846,18 @@ toolchain_PATH_env_var <- function() {
   path
 }
 
+rtools_make_path <- function() {
+  make_folder <- ""
+  if (R.version$major == "3") {
+    make_folder <- file.path(Sys.getenv("RTOOLS35_HOME"), "mingw_64", "bin")
+  } else if (rtools4x_version() == "40") {
+    make_folder <- file.path(rtools4x_home_path(), "mingw64", "bin")
+  } else {
+    make_folder <- file.path(rtools4x_home_path(), "ucrt64", "bin")
+  }
+  repair_path(make_folder)
+}
+
 rtools4x_toolchain_path <- function() {
   if (rtools4x_version() == "40") {
     toolchain_folder <- "mingw64"

R/utils.R

@@ -86,14 +86,7 @@ is_rosetta2 <- function() {
 # Returns the type of make command to use to compile depending on the OS
 make_cmd <- function() {
   if (os_is_windows() && !os_is_wsl()) {
-    if (R.version$major == "3") {
-      make_folder <- file.path(Sys.getenv("RTOOLS35_HOME"), "mingw_64", "bin")
-    } else if (rtools4x_version() == "40") {
-      make_folder <- file.path(rtools4x_home_path(), "mingw64", "bin")
-    } else {
-      make_folder <- file.path(rtools4x_home_path(), "ucrt64", "bin")
-    }
-    repair_path(file.path(make_folder, "mingw32-make.exe"))
+    repair_path(file.path(rtools_make_path(), "mingw32-make.exe"))
   } else {
     "make"
   }