diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-05-10 05:41:56 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-05-10 05:41:56 +0000 |
commit | be0f7c05d84732da3b88e45ab791375bfe417d3c (patch) | |
tree | 03e0a98112ad64d177fccc8696c0430d7e8cf09e /ldso/ldso | |
parent | 2a47ca7e9a0657b3d18e3ef920594c400d9c5c39 (diff) |
Fix up naming of ld.so so every uses the same define. The top level
was using one name and the ld.so-1 dir was using another (they happened
to be the same). Fix that.
-Erik
Diffstat (limited to 'ldso/ldso')
-rw-r--r-- | ldso/ldso/.cvsignore | 4 | ||||
-rw-r--r-- | ldso/ldso/Makefile | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ldso/ldso/.cvsignore b/ldso/ldso/.cvsignore index 0a73718a6..9103d4aa9 100644 --- a/ldso/ldso/.cvsignore +++ b/ldso/ldso/.cvsignore @@ -1,2 +1,2 @@ -ld-linux-uclibc.so* - +ld-uclibc.so* +ld.so.h diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 8c9570a17..ae181bb0a 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -11,19 +11,22 @@ OBJS=$(AOBJS) $(COBJS) ELF_LDFLAGS=--shared # using GNU ld -all: lib +all: ld.so.h lib + +ld.so.h: + echo "char *_dl_progname = \""$(UCLIBC_LDSO)"\";" > ld.so.h lib:: $(OBJS) $(DLINK_OBJS) - $(LD) -e _dl_boot $(ELF_LDFLAGS) -o $(DLINKER).$(LDSO_VMAJOR) \ - -soname $(DLINKER).$(LDSO_VMAJOR) $(OBJS) + $(LD) -e _dl_boot $(ELF_LDFLAGS) -o $(UCLIBC_LDSO) \ + -soname $(UCLIBC_LDSO) $(OBJS) $(COBJS): %.o : %.c $(CC) -I. -I./$(TARGET_ARCH) -I../libdl $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o realclean:: - $(RM) -f .depend $(DLINKER) core *.o *.a *.s *.i tmp_make foo *~ + $(RM) -f .depend $(UCLIBC_LDSO)* core *.o *.a *.s *.i tmp_make foo *~ clean:: - $(RM) -f $(DLINKER)* $(OBJS) core *.o *.a *.s *.i tmp_make foo *~ + $(RM) -f $(UCLIBC_LDSO)* $(OBJS) core *.o *.a *.s *.i tmp_make foo *~ |