set CRAN_FLAGS only when vendored packages are used

extendr · Nov 17, 2024 · d2db22e · d2db22e
1 parent 479b30f
commit d2db22e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/inst/templates/configure b/inst/templates/configure
@@ -3,7 +3,7 @@
 "${R_HOME}/bin/Rscript" tools/msrv.R 
 
 # Set CRAN_FLAGS based on the NOT_CRAN value
-if [ "${NOT_CRAN}" != "true" ]; then
+if [ "${NOT_CRAN}" != "true" ] && [ -f ./src/rust/vendor.tar.xz ]; then
   export CRAN_FLAGS="-j 2 --offline"
 else
   export CRAN_FLAGS=""

diff --git a/inst/templates/configure.win b/inst/templates/configure.win
@@ -2,13 +2,13 @@
 "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" tools/msrv.R
 
 # Set CRAN_FLAGS based on the NOT_CRAN value
-if [ "${NOT_CRAN}" != "true" ]; then
+if [ "${NOT_CRAN}" != "true" ] && [ -f ./src/rust/vendor.tar.xz ]; then
   export CRAN_FLAGS="-j 2 --offline"
 else
   export CRAN_FLAGS=""
 fi
 
-# delete Makevars if it is present
+# delete Makevars.win if it is present
 [ -f src/Makevars.win ] && rm src/Makevars.win
 
 # Substitute @CRAN_FLAGS@ in Makevars.in with the actual value of $CRAN_FLAGS

diff --git a/tests/testthat/_snaps/use_extendr.md b/tests/testthat/_snaps/use_extendr.md
@@ -27,7 +27,7 @@
       "${R_HOME}/bin/Rscript" tools/msrv.R 
       
       # Set CRAN_FLAGS based on the NOT_CRAN value
-      if [ "${NOT_CRAN}" != "true" ]; then
+      if [ "${NOT_CRAN}" != "true" ] && [ -f ./src/rust/vendor.tar.xz ]; then
         export CRAN_FLAGS="-j 2 --offline"
       else
         export CRAN_FLAGS=""
@@ -48,13 +48,13 @@
       "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" tools/msrv.R
       
       # Set CRAN_FLAGS based on the NOT_CRAN value
-      if [ "${NOT_CRAN}" != "true" ]; then
+      if [ "${NOT_CRAN}" != "true" ] && [ -f ./src/rust/vendor.tar.xz ]; then
         export CRAN_FLAGS="-j 2 --offline"
       else
         export CRAN_FLAGS=""
       fi
       
-      # delete Makevars if it is present
+      # delete Makevars.win if it is present
       [ -f src/Makevars.win ] && rm src/Makevars.win
       
       # Substitute @CRAN_FLAGS@ in Makevars.in with the actual value of $CRAN_FLAGS