diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-04-26 16:12:47 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-04-26 16:12:47 +0000 |
| commit | d13c6558a88b347301b620949aea496def2790af (patch) | |
| tree | e1b997a3bfd521213f27b73ca11e5e56aff25990 /ldso | |
| parent | 739ce2f15daa305794e3abf25e8bc92f798547f0 (diff) | |
Be more careful about not hard coding names.
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/Rules.mak | 17 | ||||
| -rw-r--r-- | ldso/ldso/.cvsignore | 2 | ||||
| -rw-r--r-- | ldso/ldso/Makefile | 3 | ||||
| -rw-r--r-- | ldso/libdl/.cvsignore | 2 | ||||
| -rw-r--r-- | ldso/libdl/Makefile | 5 |
5 files changed, 22 insertions, 7 deletions
diff --git a/ldso/Rules.mak b/ldso/Rules.mak new file mode 100644 index 000000000..b293c23d2 --- /dev/null +++ b/ldso/Rules.mak @@ -0,0 +1,17 @@ +include $(TOPDIR)Rules.mak + +LDSO_VERSION=1.9.11 +LDSO_VMAJOR=$(MAJOR_VERSION) +DLINKER = ld-linux-uclibc.so +LIBDL = libdl.so + +DEVEL=true + +# Do NOT use -fomit-frame-pointer -- It won't work! +CFLAGS += -DVERSION=\"$(LDSO_VERSION)\" + +CC = $(TOPDIR)extra/gcc-uClibc/$(NATIVE_ARCH)-uclibc-gcc +ifeq ($(DEVEL),true) + CFLAGS += -DUCLIBC_INSTALL_DIR=\"/usr/$(TARGET_ARCH)-linux-uclibc\" + CFLAGS += -DUCLIBC_DEVEL +endif diff --git a/ldso/ldso/.cvsignore b/ldso/ldso/.cvsignore index 32b7f101f..0a73718a6 100644 --- a/ldso/ldso/.cvsignore +++ b/ldso/ldso/.cvsignore @@ -1,2 +1,2 @@ -ld-linux-uclibc.so.0 +ld-linux-uclibc.so* diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 86b3bd904..20977d384 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -1,6 +1,5 @@ TOPDIR=../../ -include $(TOPDIR)Rules.mak -include $(TOPDIR)/ld.so-1/Config.mk +include $(TOPDIR)/ld.so-1/Rules.mak DIRS = $(TARGET_ARCH) diff --git a/ldso/libdl/.cvsignore b/ldso/libdl/.cvsignore index db255ec94..fcdeee985 100644 --- a/ldso/libdl/.cvsignore +++ b/ldso/libdl/.cvsignore @@ -1,2 +1,2 @@ -libdl.so.0 +libdl.so* diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index 3ebc7fea8..ca978231c 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -1,6 +1,5 @@ TOPDIR=../../ -include $(TOPDIR)Rules.mak -include $(TOPDIR)/ld.so-1/Config.mk +include $(TOPDIR)/ld.so-1/Rules.mak CFLAGS += -DNO_UNDERSCORE -DVERBOSE_DLINKER -DUSE_CACHE CFLAGS += #-fPIC -D__PIC__ #-funroll-loops @@ -21,7 +20,7 @@ ELF_LDFLAGS=--shared -nostartfiles -nostdlib # using GNU ld lib:: $(OBJS) $(CC) $(ELF_LDFLAGS) \ -o $(LIBDL).$(LDSO_VMAJOR) -Wl,-soname -Wl,$(LIBDL).$(LDSO_VMAJOR) \ - *.o $(TOPDIR)uClibc-0.95.so + *.o $(TOPDIR)$(SHARED_FULLNAME) obj: $(OBJS) |