for osx_static

RBigData · Jan 28, 2018 · 3db1702 · 3db1702
1 parent 1c4b5de
commit 3db1702
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 2018-01-27: Ver 0.3-2
   * Add overwrite.shpkg.rpath() for osx.
+  * Adjust .onLoad() for osx with ZMQ static library.
 
 2018-01-18: Ver 0.3-2
   * Adjust .onLoad().

diff --git a/R/zzz.r.in b/R/zzz.r.in
@@ -51,14 +51,14 @@
   } else{
     files <- c("libzmq.so", "libzmq.so.dSYM")
   }
-  files <- paste(dn, files, sep = "")
 
   ### Load "libzmq.*".
   for(i.file in files){
-    if(file.exists(i.file)){
-      test <- try(dyn.load(i.file, local = FALSE), silent = TRUE)
+    dn.file <- paste(dn, i.file, sep = "")
+    if(file.exists(dn.file)){
+      test <- try(dyn.load(dn.file, local = FALSE), silent = TRUE)
       if(class(test) == "try-error"){
-        stop(paste("Could not load ", i.file, ":",
+        stop(paste("Could not load ", dn.file, ":",
                    paste(test, collapse = ", "), sep = " "))
       }
       break