proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-08-14 09:32:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid re-copying the startup object files (#555)

Browse Source 
This adds a `.stamp` file to the process of copying over the `crt` files
to the sysroot directory to avoid re-copying on each `make` invocation.
This commit is contained in:
Andrew Brown 2024-11-27 13:13:06 -08:00 committed by GitHub
parent c47daaf6c6
commit 777361ddc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -772,7 +772,7 @@ $(OBJDIR)/%.o: %.s $(INCLUDE_DIRS)
$(DLMALLOC_OBJS) $(DLMALLOC_SO_OBJS): CFLAGS += \ $(DLMALLOC_OBJS) $(DLMALLOC_SO_OBJS): CFLAGS += \
-I$(DLMALLOC_INC) -I$(DLMALLOC_INC)
startup_files $(LIBC_BOTTOM_HALF_ALL_OBJS) $(LIBC_BOTTOM_HALF_ALL_SO_OBJS): CFLAGS += \ $(STARTUP_FILES) $(LIBC_BOTTOM_HALF_ALL_OBJS) $(LIBC_BOTTOM_HALF_ALL_SO_OBJS): CFLAGS += \
-I$(LIBC_BOTTOM_HALF_HEADERS_PRIVATE) \ -I$(LIBC_BOTTOM_HALF_HEADERS_PRIVATE) \
-I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC_INC) \ -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC_INC) \
-I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) \ -I$(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) \
@ -849,13 +849,18 @@ endif
@mkdir -p $(@D) @mkdir -p $(@D)
touch $@ touch $@
startup_files: $(INCLUDE_DIRS) $(LIBC_BOTTOM_HALF_CRT_OBJS) STARTUP_FILES := $(OBJDIR)/copy-startup-files.stamp
$(STARTUP_FILES): $(INCLUDE_DIRS) $(LIBC_BOTTOM_HALF_CRT_OBJS)
# #
# Install the startup files (crt1.o etc). # Install the startup files (crt1.o, etc.).
# #
mkdir -p "$(SYSROOT_LIB)" && \ mkdir -p "$(SYSROOT_LIB)"
cp $(LIBC_BOTTOM_HALF_CRT_OBJS) "$(SYSROOT_LIB)" cp $(LIBC_BOTTOM_HALF_CRT_OBJS) "$(SYSROOT_LIB)"
# Stamp the startup file installation.
@mkdir -p $(@D)
touch $@
# TODO: As of this writing, wasi_thread_start.s uses non-position-independent # TODO: As of this writing, wasi_thread_start.s uses non-position-independent
# code, and I'm not sure how to make it position-independent. Once we've done # code, and I'm not sure how to make it position-independent. Once we've done
# that, we can enable libc.so for the wasi-threads build. # that, we can enable libc.so for the wasi-threads build.
@ -907,7 +912,7 @@ $(DUMMY_LIBS):
$(AR) crs "$$lib"; \ $(AR) crs "$$lib"; \
done done
finish: startup_files libc $(DUMMY_LIBS) finish: $(STARTUP_FILES) libc $(DUMMY_LIBS)
# #
# The build succeeded! The generated sysroot is in $(SYSROOT). # The build succeeded! The generated sysroot is in $(SYSROOT).
# #
@ -935,7 +940,7 @@ endif
endif endif
check-symbols: startup_files libc check-symbols: $(STARTUP_FILES) libc
# #
# Collect metadata on the sysroot and perform sanity checks. # Collect metadata on the sysroot and perform sanity checks.
# #
@ -1114,4 +1119,4 @@ clean:
$(RM) -r "$(OBJDIR)" $(RM) -r "$(OBJDIR)"
$(RM) -r "$(SYSROOT)" $(RM) -r "$(SYSROOT)"
.PHONY: default startup_files libc libc_so finish install clean check-symbols bindings .PHONY: default libc libc_so finish install clean check-symbols bindings