From 193bd2ce375f70365bcd025d7640a69dc41fb1f5 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 21 Sep 1995 16:12:57 +0000 Subject: [PATCH] * Makerules (build-shlib): Use $(@F:lib%.so=%) in place of $(notdir $*), so it wins for the explicit libc.so rule as well as the pattern rule. --- ChangeLog | 5 +++-- Makerules | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3301ea1..1e510a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ Thu Sep 21 00:03:53 1995 Roland McGrath - * Makerules (build-shlib): Use $(@F:lib%=%) in place of $(notdir $*), - so it wins for the explicit libc.so rule as well as the pattern rule. + * Makerules (build-shlib): Use $(@F:lib%.so=%) in place of + $(notdir $*), so it wins for the explicit libc.so rule as well as the + pattern rule. * sysdeps/stub/sys/sem_buf.h (union semun): New type. diff --git a/Makerules b/Makerules index 04c4387..1899eb7 100644 --- a/Makerules +++ b/Makerules @@ -554,10 +554,10 @@ lib%.so: lib%_pic.a; $(build-shlib) define build-shlib $(LINK.o) -shared -o $@ -Wl,-soname \ - -Wl,lib$(libprefix)$(@F:lib%=%).so$($(@F)-version) \ - $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%=%).so) \ + -Wl,lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \ + $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \ -L$(firstword $(objdir) .) -L$(common-objpfx:%/=%) \ - -Wl,--whole-archive $^ $(LDLIBS-$(@F:lib%=%).so) + -Wl,--whole-archive $^ $(LDLIBS-$(@F:lib%.so=%).so) endef # Don't try to use -lc when making libc.so itself. -- 2.7.4