01/02: ld-wrapper: Ignore .so files specified after "-plugin" for RUNPATH purposes.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit b5616bc33d43f9507ffb8ac87d1e2158752c42c3
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jun 14 01:00:27 2015 +0200

    ld-wrapper: Ignore .so files specified after "-plugin" for RUNPATH purposes.
    
    Reported by Mark H Weaver
    at <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20102#58>.
    
    * gnu/packages/ld-wrapper.in (library-files-linked): Handle "-plugin"
      similarly to "-dynamic-linker".
---
 gnu/packages/ld-wrapper.in |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in
index db662e7..c3d6fa1 100644
--- a/gnu/packages/ld-wrapper.in
+++ b/gnu/packages/ld-wrapper.in
@@ -143,12 +143,16 @@ exec @GUILE@ -c "(load-compiled \"@address@hidden") 
(apply $main (cdr (command-line))
   (define path+files+args
     (fold (lambda (argument result)
             (match result
-              ((library-path library-files ("-dynamic-linker" . rest))
-               ;; When passed '-dynamic-linker ld.so', ignore 'ld.so'.
-               ;; See <http://bugs.gnu.org/20102>.
+              ((library-path library-files
+                             ((and flag
+                                   (or "-dynamic-linker" "-plugin"))
+                              . rest))
+               ;; When passed '-dynamic-linker ld.so', ignore 'ld.so'; when
+               ;; passed '-plugin liblto_plugin.so', ignore
+               ;; 'liblto_plugin.so'.  See <http://bugs.gnu.org/20102>.
                (list library-path
                      library-files
-                     (cons* argument "-dynamic-linker" rest)))
+                     (cons* argument flag rest)))
               ((library-path library-files previous-args)
                (cond ((string-prefix? "-L" argument) ;augment the search path
                       (list (append library-path