public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Fix libc.so linker script
@ 2005-03-05 16:42 Jakub Jelinek
  2005-03-05 19:25 ` Roland McGrath
  0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2005-03-05 16:42 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: Glibc hackers

Hi!

The linker script uses $(slibdir) for libc.so.6 and $(libdir) for
libc_nonshared.a, so using $(inst_slibdir) for ld-linux.so.2 is at least
inconsistent.  Either all paths must be non-inst_ ones, or all must be
inst_ ones.  As the former is what everybody is used to, here is a patch
that changes it that way.

2005-03-05  Jakub Jelinek  <jakub@redhat.com>

	* Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of
	$(inst_slibdir) in AS_NEEDED directive.

--- libc/Makerules.jj	2005-02-25 14:44:59.000000000 +0100
+++ libc/Makerules	2005-03-05 14:10:03.604286875 +0100
@@ -972,7 +972,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)
 	 cat $<; \
 	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
 	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-	      ' AS_NEEDED (' $(inst_slibdir)/$(rtld-installed-name) ') )' \
+	      ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \
 	) > $@.new
 	mv -f $@.new $@
 

	Jakub

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Fix libc.so linker script
  2005-03-05 16:42 [PATCH] Fix libc.so linker script Jakub Jelinek
@ 2005-03-05 19:25 ` Roland McGrath
  0 siblings, 0 replies; 2+ messages in thread
From: Roland McGrath @ 2005-03-05 19:25 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: Glibc hackers

> The linker script uses $(slibdir) for libc.so.6 and $(libdir) for
> libc_nonshared.a, so using $(inst_slibdir) for ld-linux.so.2 is at least
> inconsistent.  Either all paths must be non-inst_ ones, or all must be
> inst_ ones.  As the former is what everybody is used to, here is a patch
> that changes it that way.

This change is the correct one.  inst_* directories are only for the
destination that make install copies things to.  The directory names
embedded in any built file must never use the inst_* variables.

Thanks,
Roland

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-03-05 19:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-03-05 16:42 [PATCH] Fix libc.so linker script Jakub Jelinek
2005-03-05 19:25 ` Roland McGrath

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).