More robust compiler flags

Author: shikokuchuo

configure

@@ -9,7 +9,10 @@ PKG_LIBS="-lpthread"
 
 # Find compiler and export flags
 CC=`"${R_HOME}/bin/R" CMD config CC`
-export CC
+CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
+CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
+LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
+export CC CFLAGS CPPFLAGS LDFLAGS
 
 if [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
 export MACOSX_DEPLOYMENT_TARGET=`echo $CC | sed -En 's/.*-version-min=([0-9][0-9.]*).*/\1/p'`

configure.ucrt

@@ -3,7 +3,10 @@ LIB_VER="5c443d2"
 
 # Find compiler and export flags
 CC=`"${R_HOME}/bin/R" CMD config CC`
-export CC
+CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
+CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
+LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
+export CC CFLAGS CPPFLAGS LDFLAGS
 
 echo "Compiling 'libfswatch' from source..."
 gzip -dc src/fswatch-$LIB_VER.tar.gz | tar -xf -

configure.win

@@ -7,7 +7,10 @@ for ARCH in x64 i386; do
 
   if [ -e "${R_HOME}/bin/${ARCH}/R" ]; then
     CC=`"${R_HOME}/bin/${ARCH}/R" CMD config CC`
-    export CC
+    CFLAGS=`"${R_HOME}/${ARCH}/bin/R" CMD config CFLAGS`
+    CPPFLAGS=`"${R_HOME}/${ARCH}/bin/R" CMD config CPPFLAGS`
+    LDFLAGS=`"${R_HOME}/${ARCH}/bin/R" CMD config LDFLAGS`
+    export CC CFLAGS CPPFLAGS LDFLAGS
 
     echo "Compiling 'libfswatch' from source..."
 

tests/testthat/test-watch.R

@@ -25,6 +25,7 @@ test_that("watcher() logs", {
 })
 
 test_that("watcher() callbacks", {
+  skip_if(R.version$arch == "aarch64" && !Sys.getenv("NOT_CRAN") == "true")
   x <- 0L
   w <- watcher(c(dir, dir2), callback = ~{is.character(.x) || stop(); x <<- x + 1L}, latency = 0.2)
   expect_output(print(w))