diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Makefile.in | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/libc/Makefile.in b/libc/Makefile.in index 83a5a9392..ae506f8dc 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -15,7 +15,7 @@ endif LDFLAGS-libc.so := $(LDFLAGS) $(VERSION_SCRIPT) -init __uClibc_init -LIBS-libc.so := $(interp) $(top_builddir)lib/$(UCLIBC_LDSO) +LIBS-libc.so := $(interp) $(ldso) # we have SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) defined in Rules.mak libc_FULL_NAME := libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so @@ -39,13 +39,17 @@ include $(libc_DIR)/unistd/Makefile.in libc-a-y += $(libc-static-y) libc-so-y += $(libc-shared-y) +ifeq ($(DOPIC),y) +libc-a-y := $(libc-a-y:.o=.os) +endif + libc-nomulti-y += $(libc-shared-y) -lib-a-y += $(top_builddir)lib/libc.a $(crt-y) -lib-so-y += libc-y $(top_builddir)lib/$(NONSHARED_LIBNAME) $(crt-y) +lib-a-y += $(top_builddir)lib/libc.a +lib-so-y += $(libc) objclean-y += libc_clean -$(top_builddir)lib/libc.so: $(libc_OUT)/libc_so.a $(interp) +$(libc): $(libc_OUT)/libc_so.a $(LIBS-libc.so) $(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION)) $(Q)$(RM) $@ $(Q)echo "/* GNU ld script" > $@ @@ -57,26 +61,20 @@ else $(Q)echo "GROUP ( $(SHARED_MAJORNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@ endif -$(libc_OUT)/libc_so.a: $(libc-so-y) +$(libc_OUT)/libc_so.a: $(libc-so-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME) $(Q)$(RM) $@ - $(do_strip) - $(do_ar) - ifeq ($(DOPIC),y) -$(top_builddir)lib/libc.a: $(libc-a-y:.o=.os) + $(Q)$(STRIPTOOL) $(STRIP_FLAGS) $(libc-shared-y) else -$(top_builddir)lib/libc.a: $(libc-a-y) $(libc_OUT)/libc_so.a + $(do_strip) endif + $(do_ar) + +$(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ -ifeq ($(DOPIC),y) - $(Q)$(STRIPTOOL) $(STRIP_FLAGS) $(filter-out $(libc-so-y),$^) -else $(do_strip) -endif $(do_ar) -$(top_builddir)lib/$(NONSHARED_LIBNAME): $(top_builddir)lib/libc.a - libc_clean: $(RM) $(libc_OUT)/*.{o,os,a} |