Skip to content

Commit

Permalink
maybe fix logic
Browse files Browse the repository at this point in the history
  • Loading branch information
paleolimbot committed Nov 8, 2023
1 parent 0709f30 commit ff398ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 0 additions & 3 deletions ci/docker/linux-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ ENV R_PRUNE_DEPS=${r_prune_deps}
ARG r_custom_ccache=false
ENV R_CUSTOM_CCACHE=${r_custom_ccache}

ARG r_libarrow_binary=FALSE
ENV LIBARROW_BINARY=${r_libarrow_binary}

ARG tz="UTC"
ENV TZ=${tz}

Expand Down
4 changes: 3 additions & 1 deletion r/tools/nixlibs.R
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,8 @@ build_ok <- !env_is("LIBARROW_BUILD", "false")
# https://arrow.apache.org/docs/developers/cpp/building.html#offline-builds)
download_ok <- !test_mode && !env_is("TEST_OFFLINE_BUILD", "true")

download_libarrow_ok <- download_ok && !env_is("LIBARROW_DOWNLOAD", "false")

# This "tools/thirdparty_dependencies" path, within the tar file, might exist if
# create_package_with_all_dependencies() was run, or if someone has created it
# manually before running make build.
Expand Down Expand Up @@ -920,7 +922,7 @@ if (!test_mode && !file.exists(api_h)) {
lg("File not found: %s ($ARROW_DOWNLOADED_BINARIES)", bin_zip)
bin_file <- NULL
}
} else if (download_ok) {
} else if (download_libarrow_ok) {
binary_flavor <- identify_binary()
if (!is.null(binary_flavor)) {
# The env vars say we can, and we've determined a lib that should work
Expand Down

0 comments on commit ff398ed

Please sign in to comment.