better LdFlags

Author: tnagler

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: RcppThread
 Title: R-Friendly Threading in C++
-Version: 2.1.1
+Version: 2.1.2
 Authors@R: c(
     person("Thomas", "Nagler",, "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1855-0046"))

NEWS.md

@@ -1,4 +1,4 @@
-# RcppThread 2.1.1
+# RcppThread 2.1.2
 
 NEW FEATURE
 

R/LdFlags.R

@@ -1,74 +1,87 @@
-checkForLibAtomic <- function() {
-    if (.Platform$OS.type == "windows")
-        return(FALSE)
+getCompiler <- function() {
+    tools::Rcmd(c("config", "CXX"), stdout = TRUE)
+}
+
+runCmd <- function(...) {
+    args <- list(command = paste(...))
+    args$ignore.stdout = TRUE
+    args$ignore.stderr = TRUE
+    do.call(system, args)
+}
+
+createTestFiles <- function() {
+    src <- tempfile("test", fileext = ".cpp")
+    lib <- tempfile("test", fileext = ".out")
+    c(src = src, lib = lib)
+}
 
-    fl <- tempfile("test", fileext = ".cpp")
+writeLibAtomicTest <- function(file) {
     cat(
         "#include <atomic>
         std::atomic<int> x;
         int main() {
             std::atomic_is_lock_free(&x);
             return 0;
         }",
-        file = fl
+        file = file
     )
+}
+
+checkForLibAtomic <- function() {
+    if (.Platform$OS.type == "windows")
+        return(TRUE)
+
+    # create temporary source and out files
+    tmp <- createTestFiles()
+    writeLibAtomicTest(tmp["src"])
 
-    compiler <- tools::Rcmd(c("config", "CXX"), stdout = TRUE)
-    failed <- system(paste(compiler, fl, "-latomic"),
-                     ignore.stdout = TRUE,
-                     ignore.stderr = TRUE)
-    unlink(fl)
+    # check whether test program can be compiled
+    failed <- runCmd(getCompiler(), tmp["src"], "-o", tmp["lib"], "-latomic")
 
-    return(!failed)
+    # clean up temporary files
+    unlink(tmp)
+
+    !failed
 }
 
 hasAtomicSupport <- function() {
     if (checkForLibAtomic())
         return(TRUE)
 
-    fl <- tempfile("test", fileext = ".cpp")
-    cat(
-        "#include <atomic>
-        std::atomic<int> x;
-        int main() {
-            std::atomic_is_lock_free(&x);
-            return 0;
-        }",
-        file = fl
-    )
-    compiler <- tools::Rcmd(c("config", "CXX"), stdout = TRUE)
-    failed <- system(paste(compiler, fl),
-                     ignore.stdout = TRUE,
-                     ignore.stderr = TRUE)
-    unlink(fl)
+    # create temporary source and out files
+    tmp <- createTestFiles()
+    writeLibAtomicTest(tmp["src"])
+
+    # check whether test program can be compiled
+    failed <- runCmd(getCompiler(), tmp["src"], "-o", tmp["lib"])
 
-    return(!failed)
+    # clean up temporary files
+    unlink(tmp)
+
+    !failed
 }
 
 checkForLibPthread <- function() {
     if (.Platform$OS.type == "windows")
         return(FALSE)
 
-    fl <- tempfile("test", fileext = ".cpp")
-    cat(
-        "#include <pthread.h>
-        int main() {
-             return 0;
-        }",
-        file = fl)
-
-    compiler <- system("R CMD config CXX", intern = TRUE)
-    failed <- system(paste(compiler, fl, "-lpthread"),
-                     ignore.stdout = TRUE,
-                     ignore.stderr = TRUE)
-    unlink(fl)
-    return(!failed)
+    # create temporary source and out files
+    tmp <- createTestFiles()
+    cat("#include <pthread.h> \n int main() { return 0; }", file = tmp["src"])
+
+    # check whether test program can be compiled
+    failed <- runCmd(getCompiler(), tmp["src"], "-o", tmp["lib"], "-lpthread")
+
+    # clean up temporary files
+    unlink(tmp)
+
+    !failed
 }
 
 
 #' Get portable linker flags for libraries building on RcppThread
 #'
-#' To be used in `Makevars` on Linux and OSX. Returns a character vector with
+#' To be used in `Makevars` on Linux and OSX. Returns a string with
 #' linker flags for `pthread` and `libatomic`, if available.
 #'
 #' Use as