proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-08-15 11:04:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile: Don't mix phony targets with directory names

Browse Source 
Remove build rules for $(SYSROOT) and $(SYSROOT_INC).  The latter
becomes `include_dirs`.  The former is not needed, instead just add
startup_files to the finish rule.
This commit is contained in:
Sam Clegg 2019-05-02 11:26:44 -07:00 committed by Dan Gohman
parent 5ae626e99d
commit 8e8cc34aad
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -233,15 +233,15 @@ $(MUSL_PRINTSCAN_NO_FLOATING_POINT_OBJS): override WASM_CFLAGS += \
-D__wasilibc_printscan_no_floating_point \ -D__wasilibc_printscan_no_floating_point \
-D__wasilibc_printscan_floating_point_support_option="\"remove -lc-printscan-no-floating-point from the link command\"" -D__wasilibc_printscan_floating_point_support_option="\"remove -lc-printscan-no-floating-point from the link command\""
$(OBJDIR)/%.long-double.o: $(CURDIR)/%.c $(SYSROOT_INC) $(OBJDIR)/%.long-double.o: $(CURDIR)/%.c include_dirs
@mkdir -p "$(@D)" @mkdir -p "$(@D)"
"$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $< "$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $<
$(OBJDIR)/%.no-floating-point.o: $(CURDIR)/%.c $(SYSROOT_INC) $(OBJDIR)/%.no-floating-point.o: $(CURDIR)/%.c include_dirs
@mkdir -p "$(@D)" @mkdir -p "$(@D)"
"$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $< "$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $<
$(OBJDIR)/%.o: $(CURDIR)/%.c $(SYSROOT_INC) $(OBJDIR)/%.o: $(CURDIR)/%.c include_dirs
@mkdir -p "$(@D)" @mkdir -p "$(@D)"
"$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $< "$(WASM_CC)" $(WASM_CFLAGS) -MD -MP -o $@ -c $<
@ -271,9 +271,7 @@ $(LIBC_TOP_HALF_ALL_OBJS) $(MUSL_PRINTSCAN_LONG_DOUBLE_OBJS) $(MUSL_PRINTSCAN_NO
-Wno-dangling-else \ -Wno-dangling-else \
-Wno-unknown-pragmas -Wno-unknown-pragmas
$(SYSROOT): startup_files libc finish check include_dirs:
$(SYSROOT_INC):
$(RM) -r "$(SYSROOT)" $(RM) -r "$(SYSROOT)"
# #
@ -382,7 +380,7 @@ else
override CRT_SOURCES = $(LIBC_BOTTOM_HALF_CRT_SOURCES) override CRT_SOURCES = $(LIBC_BOTTOM_HALF_CRT_SOURCES)
endif endif
startup_files: $(SYSROOT_INC) startup_files: include_dirs
# #
# Build the startup files. # Build the startup files.
# #
@ -392,13 +390,13 @@ startup_files: $(SYSROOT_INC)
mkdir -p "$(SYSROOT_LIB)" && \ mkdir -p "$(SYSROOT_LIB)" && \
mv *.o "$(SYSROOT_LIB)" mv *.o "$(SYSROOT_LIB)"
libc: $(SYSROOT_INC) \ libc: include_dirs \
$(SYSROOT_LIB)/libc.a \ $(SYSROOT_LIB)/libc.a \
$(SYSROOT_LIB)/libc-printscan-long-double.a \ $(SYSROOT_LIB)/libc-printscan-long-double.a \
$(SYSROOT_LIB)/libc-printscan-no-floating-point.a \ $(SYSROOT_LIB)/libc-printscan-no-floating-point.a \
$(SYSROOT_LIB)/libwasi-emulated-mman.a $(SYSROOT_LIB)/libwasi-emulated-mman.a
finish: $(SYSROOT_INC) libc finish: startup_files libc
# #
# Create empty placeholder libraries. # Create empty placeholder libraries.
# #
@ -461,12 +459,12 @@ finish: $(SYSROOT_INC) libc
# The build succeeded! The generated sysroot is in $(SYSROOT). # The build succeeded! The generated sysroot is in $(SYSROOT).
# #
check: $(SYSROOT) finish check: finish
# Check that the computed metadata matches the expected metadata. # Check that the computed metadata matches the expected metadata.
diff -ur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)" diff -ur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)"
install: $(SYSROOT) install: finish
mkdir -p "$(INSTALL_DIR)" mkdir -p "$(INSTALL_DIR)"
cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)" cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
.PHONY: $(SYSROOT) default startup_files libc finish check install $(SYSROOT_INC) .PHONY: default startup_files libc finish check install include_dirs