Skip to content

Commit cb95407

Browse files
committed
Fixes for blank version
1 parent 62fd754 commit cb95407

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

R/install.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,8 @@ rtools4x_toolchain_path <- function() {
866866
if (arch_is_aarch64()) {
867867
toolchain <- "aarch64-w64-mingw32.static.posix"
868868
} else {
869-
if (rtools4x_version() < "44" || Sys.getenv("CMDSTANR_USE_MSYS_TOOLCHAIN") != "" || cmdstan_version() < "2.35.0") {
869+
if (rtools4x_version() < "44" || Sys.getenv("CMDSTANR_USE_MSYS_TOOLCHAIN") != "" ||
870+
isTRUE(cmdstan_version(error_on_NA=FALSE) < "2.35.0")) {
870871
toolchain <- ifelse(is_ucrt_toolchain(), "ucrt64", "mingw64")
871872
} else {
872873
toolchain <- "x86_64-w64-mingw32.static.posix"

R/utils.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ arch_is_aarch64 <- function() {
9696
make_cmd <- function() {
9797
if (Sys.getenv("MAKE") != "") {
9898
Sys.getenv("MAKE")
99-
} else if (os_is_windows() && !os_is_wsl() && (rtools4x_version() < "44" || Sys.getenv("CMDSTANR_USE_MSYS_TOOLCHAIN") != "" || cmdstan_version() < "2.35.0")) {
99+
} else if (os_is_windows() && !os_is_wsl() &&
100+
(rtools4x_version() < "44" || Sys.getenv("CMDSTANR_USE_MSYS_TOOLCHAIN") != "" || isTRUE(cmdstan_version(error_on_NA=FALSE) < "2.35.0"))) {
100101
"mingw32-make.exe"
101102
} else {
102103
"make"

0 commit comments

Comments
 (0)