diff options
| -rw-r--r-- | Makerules | 3 | ||||
| -rw-r--r-- | Rules.mak | 4 | ||||
| -rw-r--r-- | libc/Makefile.in | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -141,6 +141,9 @@ $(interp): $(top_builddir)lib/interp.c $(ldso): cd $(top_builddir); $(MAKE) lib/$(patsubst %.$(MAJOR_VERSION),%,$(notdir $@)) +$(libc): + cd $(top_builddir); $(MAKE) lib/$(patsubst %.$(MAJOR_VERSION),%,$(notdir $@)) + #ifeq ($(HAVE_ELF),y) CRT=crt1 #else @@ -60,12 +60,12 @@ LIBC := libc SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION) UCLIBC_LDSO := ld-uClibc.so.$(MAJOR_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a -libc := $(top_builddir)lib/$(LIBC).so +libc := $(top_builddir)lib/$(SHARED_MAJORNAME) interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) #LIBS :=$(interp) -L$(top_builddir)lib -lc -LIBS := $(interp) -L$(top_builddir)lib $(libc) +LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(MAJOR_VERSION)=) # Make sure DESTDIR and PREFIX can be used to install # PREFIX is a uClibcism while DESTDIR is a common GNUism diff --git a/libc/Makefile.in b/libc/Makefile.in index ae506f8dc..b03132256 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -49,7 +49,7 @@ lib-a-y += $(top_builddir)lib/libc.a lib-so-y += $(libc) objclean-y += libc_clean -$(libc): $(libc_OUT)/libc_so.a $(LIBS-libc.so) +$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so) $(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) $(Q)$(RM) $@ $(Q)echo "/* GNU ld script" > $@ |