Don't put absolute pathnames into libc.so and libpthread.so linker scripts -- absolut...

diff --git a/Makerules b/Makerules
index b46b09b369b4e1c5c7a99e523f22e9f4a3d0969f..0a992e9301a1da8d50fb4735425d8968e3c0c021 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -958,9 +958,9 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
         echo '   Use the shared library, but some functions are only in';\
         echo '   the static library, so try that secondarily.  */';\
         cat $<; \
-        echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
-             '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-             ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
+        echo 'GROUP ( libc.so$(libc.so-version)' \
+             '$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
+             ' AS_NEEDED (' $(rtld-installed-name) ') )' \
        ) > $@.new
        mv -f $@.new $@
 

diff --git a/README.google b/README.google
index f65b7a35cd62bf5295ae14d1cabc63cf9a26fb2b..a362f975f0bb37e03268801a1ef2f51a88ef4128 100644 (file)
--- a/README.google
+++ b/README.google
@@ -71,4 +71,11 @@ hesiod/Makefile
   For b/2476399, disable Hesiod (not used in google).
   Forward-ported from cl/52537558.
   (ppluzhnikov, google-local)
-  
+
+Makerules
+nptl/Makefile
+  Don't put absolute pathnames into libc.so and libpthread.so linker
+  scripts -- absolute pathnames interfere with --sysroot.
+  cl/51074128 from eglibc-2.18
+  (ppluzhnikov, google-local)
+

diff --git a/nptl/Makefile b/nptl/Makefile
index a43e7408476100f48ee3d73925e2c362744b5c90..f2c3006b308ab4cae6b9a97c9bb9675423460779 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -393,8 +393,8 @@ $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
         echo '   Use the shared library, but some functions are only in';\
         echo '   the static library, so try that secondarily.  */';\
         cat $<; \
-        echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
-             '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\
+        echo 'GROUP ( libpthread.so$(libpthread.so-version)' \
+             '$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\
              ')' \
        ) > $@.new
        mv -f $@.new $@