aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makerules6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d15c02a..3301ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
Thu Sep 21 00:03:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+ * 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.
+
* sysdeps/stub/sys/sem_buf.h (union semun): New type.
* sysdeps/mach/hurd/i386/init-first.c (init1) [PIC]: Call
diff --git a/Makerules b/Makerules
index a781c43..04c4387 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)$(notdir $*).so$($(@F)-version) \
- $(LDFLAGS.so) $(LDFLAGS-$(notdir $*).so) \
+ -Wl,lib$(libprefix)$(@F:lib%=%).so$($(@F)-version) \
+ $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%=%).so) \
-L$(firstword $(objdir) .) -L$(common-objpfx:%/=%) \
- -Wl,--whole-archive $^ $(LDLIBS-$(notdir $*).so)
+ -Wl,--whole-archive $^ $(LDLIBS-$(@F:lib%=%).so)
endef
# Don't try to use -lc when making libc.so itself.