Skip to content

Commit

Permalink
rephrase latest nightly message
Browse files Browse the repository at this point in the history
  • Loading branch information
assignUser committed Nov 30, 2023
1 parent 9e9cead commit 950f1dd
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions r/tools/nixlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ find_latest_nightly <- function(description_version,
lg("Failed to find latest nightly for %s", description_version)
latest <- description_version
} else {
lg("Found latest nightly for %s: %s", description_version, res)
lg("Latest available nightly for %s: %s", description_version, res)
latest <- res
}
latest
Expand Down Expand Up @@ -295,32 +295,32 @@ determine_binary_from_stderr <- function(errs) {
if (is.null(attr(errs, "status"))) {
# There was no error in compiling: so we found libcurl and OpenSSL >= 1.1,
# openssl is < 3.0
lg("Found libcurl and OpenSSL >= 1.1")
lg("Found headers for libcurl and OpenSSL >= 1.1")
return("openssl-1.1")
# Else, check for dealbreakers:
} else if (!on_macos && any(grepl("Using libc++", errs, fixed = TRUE))) {
# Our linux binaries are all built with GNU stdlib so they fail with libc++
lg("Linux binaries incompatible with libc++")
return(NULL)
} else if (header_not_found("curl/curl", errs)) {
lg("libcurl not found")
lg("Headers for libcurl not found")
return(NULL)
} else if (header_not_found("openssl/opensslv", errs)) {
lg("OpenSSL not found")
lg("Headers for OpenSSL not found")
return(NULL)
} else if (any(grepl("OpenSSL version too old", errs))) {
lg("OpenSSL found but version >= 1.0.2 is required for some features")
lg("Headers for OpenSSL found but version >= 1.0.2 is required for some features")
return(NULL)
# Else, determine which other binary will work
} else if (any(grepl("Using OpenSSL version 1.0", errs))) {
if (on_macos) {
lg("OpenSSL 1.0 is not supported on macOS")
return(NULL)
}
lg("Found libcurl and OpenSSL < 1.1")
lg("Found headers for libcurl and OpenSSL < 1.1")
return("openssl-1.0")
} else if (any(grepl("Using OpenSSL version 3", errs))) {
lg("Found libcurl and OpenSSL >= 3.0.0")
lg("Found headers for libcurl and OpenSSL >= 3.0.0")
return("openssl-3.0")
}
NULL
Expand Down

0 comments on commit 950f1dd

Please sign in to comment.