diff --git a/configure b/configure index b9468a3..3586297 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.win b/configure.win index f1d426e..afc4456 100755 --- a/configure.win +++ b/configure.win @@ -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 diff --git a/tools/print_r_version.R b/tools/print_r_version.R deleted file mode 100644 index 71506fe..0000000 --- a/tools/print_r_version.R +++ /dev/null @@ -1,3 +0,0 @@ -devel_prefix <- if(isTRUE(grepl("devel", R.version$status, fixed = TRUE))) "-devel" else "" -r_version <- sprintf("%s.%s%s", R.version$major, R.version$minor, devel_prefix) -cat(r_version)