Skip to content

Commit

Permalink
Remove LIBRSYS_R_VERSION as this no longer depends on libR-sys
Browse files Browse the repository at this point in the history
  • Loading branch information
yutannihilation committed Jan 8, 2024
1 parent 1589cea commit 803a134
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
5 changes: 1 addition & 4 deletions configure
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# The envvar used in libR-sys crate
LIBRSYS_R_VERSION=$("${R_HOME}/bin/Rscript" "./tools/print_r_version.R")

# Variables used for tweaking Makevars
BEFORE_CARGO_BUILD="export LIBRSYS_R_VERSION=\"${LIBRSYS_R_VERSION}\" \\&\\&"
BEFORE_CARGO_BUILD=''
AFTER_CARGO_BUILD=''

# Even when `cargo` is on `PATH`, `rustc` might not. We need to source
Expand Down
5 changes: 1 addition & 4 deletions configure.win
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# The envvar used in libR-sys crate
LIBRSYS_R_VERSION=$("${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "./tools/print_r_version.R")

# Variables used for tweaking Makevars
BEFORE_CARGO_BUILD="export LIBRSYS_R_VERSION=\"${LIBRSYS_R_VERSION}\" \\&\\&"
BEFORE_CARGO_BUILD=''
AFTER_CARGO_BUILD=''

# Check the Rust installation, and abort if not available
Expand Down
3 changes: 0 additions & 3 deletions tools/print_r_version.R

This file was deleted.

0 comments on commit 803a134

Please sign in to comment.