diff --git a/R/install.R b/R/install.R index 8de3ac22..39255af5 100644 --- a/R/install.R +++ b/R/install.R @@ -818,11 +818,13 @@ is_toolchain_installed <- function(app, path) { ) app_path <- withr::with_path( c( - toolchain_PATH_env_var() + toolchain_PATH_env_var(), + rtools_make_path() ), repair_path(dirname(Sys.which(app))) ) - if (normalizePath(app_path) != normalizePath(rtools4x_toolchain_path())) { + if (!(normalizePath(app_path) %in% c(normalizePath(rtools4x_toolchain_path()), + normalizePath(rtools_make_path())))) { return(FALSE) } return(TRUE)