Merge pull request #20 from dcdillon/bugfix/plugin-and-stripper-2

Stripper and plugin now dig down to the actual linker

Author: dcdillon

R/plugin.R

@@ -12,7 +12,16 @@
     if (shlib_ld != "") {
         shlib_ld_good <- tryCatch({
             shlib_ld_results <- system(paste0(shlib_ld, " --version"), intern=TRUE)
-            shlib_ld_good <- any(grepl(linker_pattern, shlib_ld_results))
+            
+            if (any(grepl(linker_pattern, shlib_ld_results))) {
+                shlib_ld_prog <- system(paste0(shlib_ld, " --print-prog-name=ld"), intern=TRUE)
+                shlib_ld_results <- system(paste0(shlib_ld_prog, " --version"), intern=TRUE)
+                
+                shlib_ld_good <- (grepl("^GNU (ld|gold)", shlib_ld_results[1]))
+            } else {
+                shlib_ld_good <- FALSE
+            }
+            
             shlib_ld_good
         }, warning = function(w) {
             return(FALSE)
@@ -25,8 +34,17 @@
 
     if (shlib_cxxld != "") {
         shlib_cxxld_good <- tryCatch({
-            shlib_cxxld_results <- system(paste0(shlib_ld, " --version"), intern=TRUE)
-            shlib_cxxld_good <- any(grepl(linker_pattern, shlib_ld_results))
+            shlib_cxxld_results <- system(paste0(shlib_cxxld, " --version"), intern=TRUE)
+            
+            if (any(grepl(linker_pattern, shlib_cxxld_results))) {
+                shlib_cxxld_prog <- system(paste0(shlib_cxxld, " --print-prog-name=ld"), intern=TRUE)
+                shlib_cxxld_results <- system(paste0(shlib_cxxld_prog, " --version"), intern=TRUE)
+                
+                shlib_cxxld_good <- (grepl("^GNU (ld|gold)", shlib_cxxld_results[1]))
+            } else {
+                shlib_cxxld_good <- FALSE
+            }
+            
             shlib_cxxld_good
         }, warning = function(w) {
             return(FALSE)

inst/tools/stripper

@@ -27,22 +27,40 @@ SHLIB_CXXLD_RESULTS=0
 
 if [ "$SHLIB_LD" != "" ]; then
     OUTPUT=`$SHLIB_LD --version`
+    LD_PROG=""
 
     case "$OUTPUT" in
-        *gcc*) SHLIB_LD_RESULTS=1 ;;
-        *g++*) SHLIB_LD_RESULTS=1 ;;
-        *clang*) SHLIB_LD_RESULTS=1 ;;
+        *gcc*) LD_PROG=`$SHLIB_LD --print-prog-name=ld` ;;
+        *g++*) LD_PROG=`$SHLIB_LD --print-prog-name=ld` ;;
+        *clang*) LD_PROG=`$SHLIB_LD --print-prog-name=ld` ;;
     esac
+    
+    if [ "$LD_PROG" != "" ]; then
+        OUTPUT=`$LD_PROG --version`
+        case "$OUTPUT" in
+            GNU?ld*) SHLIB_LD_RESULTS=1 ;;
+            GNU?gold*) SHLIB_LD_RESULTS=1 ;;
+        esac
+    fi
 fi
 
 if [ "$SHLIB_CXXLD" != "" ]; then
     OUTPUT=`$SHLIB_CXXLD --version`
+    LD_PROG=""
 
     case "$OUTPUT" in
-        *gcc*) SHLIB_CXXLD_RESULTS=1 ;;
-        *g++*) SHLIB_CXXLD_RESULTS=1 ;;
-        *clang*) SHLIB_CXXLD_RESULTS=1 ;;
+        *gcc*) LD_PROG=`$SHLIB_CXXLD --print-prog-name=ld` ;;
+        *g++*) LD_PROG=`$SHLIB_CXXLD --print-prog-name=ld` ;;
+        *clang*) LD_PROG=`$SHLIB_CXXLD --print-prog-name=ld` ;;
     esac
+    
+    if [ "$LD_PROG" != "" ]; then
+        OUTPUT=`$LD_PROG --version`
+        case "$OUTPUT" in
+            GNU?ld*) SHLIB_CXXLD_RESULTS=1 ;;
+            GNU?gold*) SHLIB_CXXLD_RESULTS=1 ;;
+        esac
+    fi
 fi
 
 # Clean up any temporary files we created previously