Skip to content

Commit

Permalink
consolidate libwasi-emulated-*.so into a single library
Browse files Browse the repository at this point in the history
Signed-off-by: Joel Dice <[email protected]>
  • Loading branch information
dicej committed Aug 10, 2023
1 parent dbe2cb1 commit c651822
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -490,13 +490,12 @@ $(SYSROOT_LIB)/%.so: $(OBJDIR)/%.so.a $(BUILTINS_LIB)

$(OBJDIR)/libc.so.a: $(LIBC_SO_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_SO_OBJS)

$(OBJDIR)/libwasi-emulated-mman.so.a: $(LIBWASI_EMULATED_MMAN_SO_OBJS)

$(OBJDIR)/libwasi-emulated-process-clocks.so.a: $(LIBWASI_EMULATED_PROCESS_CLOCKS_SO_OBJS)

$(OBJDIR)/libwasi-emulated-getpid.so.a: $(LIBWASI_EMULATED_GETPID_SO_OBJS)

$(OBJDIR)/libwasi-emulated-signal.so.a: $(LIBWASI_EMULATED_SIGNAL_SO_OBJS) $(LIBWASI_EMULATED_SIGNAL_MUSL_SO_OBJS)
$(OBJDIR)/libwasi-emulated.so.a: \
$(LIBWASI_EMULATED_MMAN_SO_OBJS) \
$(LIBWASI_EMULATED_PROCESS_CLOCKS_SO_OBJS) \
$(LIBWASI_EMULATED_GETPID_SO_OBJS) \
$(LIBWASI_EMULATED_SIGNAL_SO_OBJS) \
$(LIBWASI_EMULATED_SIGNAL_MUSL_SO_OBJS)

$(SYSROOT_LIB)/libc.a: $(LIBC_OBJS)

Expand Down Expand Up @@ -632,10 +631,7 @@ startup_files: include_dirs $(LIBC_BOTTOM_HALF_CRT_OBJS)
ifneq ($(THREAD_MODEL), posix)
LIBC_SO = \
$(SYSROOT_LIB)/libc.so \
$(SYSROOT_LIB)/libwasi-emulated-mman.so \
$(SYSROOT_LIB)/libwasi-emulated-process-clocks.so \
$(SYSROOT_LIB)/libwasi-emulated-getpid.so \
$(SYSROOT_LIB)/libwasi-emulated-signal.so
$(SYSROOT_LIB)/libwasi-emulated.so
endif

libc_so: include_dirs $(LIBC_SO)
Expand Down

0 comments on commit c651822

Please sign in to comment.