[hurd] 24/75: Use -L instead of -Wl,-rpath-link

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch dde
in repository hurd.

commit c9c29eb890527fe68900e4a0af7c2df9a9fa5b40
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 29 16:47:06 2015 +0100

    Use -L instead of -Wl,-rpath-link
    
    The latter does not work for libpthread.a which passes -lihash, which would
    find the installed libihash.a instead of the just-compiled one.
    
    * Makeconf (rpath): Remove, replaced by...
    (lpath): ... new variable.
    (link-executable, $(libname).so.$(hurd-version)): Use $(lpath) instead of
    $(rpath).
---
 Makeconf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makeconf b/Makeconf
index b42e4c7..dc435db 100644
--- a/Makeconf
+++ b/Makeconf
@@ -324,7 +324,7 @@ _libsubst=${libsubst$(patsubst 
%,-override,${libsubst-override})}
 
 # Direct the linker where to find shared objects specified in the
 # dependencies of other shared objects it encounters.
-rpath := -Wl,-rpath-link=.:$(subst $. ,:,$(dir $(wildcard ../lib*/lib*.so)))
+lpath := -L. $(patsubst %,-L%,$(dir $(wildcard ../lib*/lib*.so)))
 
 # Main rule to link executables
 #
@@ -333,7 +333,7 @@ rpath := -Wl,-rpath-link=.:$(subst $. ,:,$(dir $(wildcard 
../lib*/lib*.so)))
 ifeq ($(prof-depend),)
 
 define link-executable
-$(CC) $(rpath) $(CFLAGS) $($*-CFLAGS) $(LDFLAGS) $($*-LDFLAGS) \
+$(CC) $(lpath) $(CFLAGS) $($*-CFLAGS) $(LDFLAGS) $($*-LDFLAGS) \
       $(BUGADDR_REF) \
       -o $@
 endef
@@ -382,7 +382,7 @@ $(libname)_pic.a: $(patsubst %.o,%_pic.o,$(OBJS))
 # we make that a symlink.
 $(libname).so.$(hurd-version): $(patsubst %.o,%_pic.o,$(OBJS)) $(library_deps)
        $(CC) -shared -Wl,-soname=$@ -o $@ \
-             $(rpath) $(CFLAGS) $(LDFLAGS) $($(libname).so-LDFLAGS) \
+             $(lpath) $(CFLAGS) $(LDFLAGS) $($(libname).so-LDFLAGS) \
              '-Wl,-(' $(filter-out %.map,$^) \
                       $($(libname).so-LDLIBS) $(LDLIBS) \
              '-Wl,-)' $(filter %.map,$^)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git