diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2014-02-28 15:47:22 -0800 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2014-02-28 15:47:22 -0800 |
| commit | 3ba0025a849444bc97426725c88b698beabd8ac2 (patch) | |
| tree | 2a6edb7553552b6e288ff23f1b0e6d29555a89d8 | |
| parent | 019516567fca015097722b42035d8c3cbf8f6eb6 (diff) | |
| download | glibc-3ba0025a849444bc97426725c88b698beabd8ac2.tar.gz glibc-3ba0025a849444bc97426725c88b698beabd8ac2.tar.xz glibc-3ba0025a849444bc97426725c88b698beabd8ac2.zip | |
Don't put absolute pathnames into libc.so and libpthread.so linker scripts -- absolute pathnames interfere with --sysroot.
| -rw-r--r-- | Makerules | 6 | ||||
| -rw-r--r-- | README.google | 9 | ||||
| -rw-r--r-- | nptl/Makefile | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/Makerules b/Makerules index b46b09b369..0a992e9301 100644 --- 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 f65b7a35cd..a362f975f0 100644 --- 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 a43e740847..f2c3006b30 100644 --- 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 $@ |