Skip to content

Commit 30b4bda

Browse files
committed
exclude setjmp.h in the correct place
1 parent 4fcc2cb commit 30b4bda

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ LIBC_BOTTOM_HALF_OMIT_SOURCES := \
9494
$(LIBC_BOTTOM_HALF_SOURCES)/accept-wasip2.c
9595
LIBC_BOTTOM_HALF_ALL_SOURCES := $(filter-out $(LIBC_BOTTOM_HALF_OMIT_SOURCES),$(LIBC_BOTTOM_HALF_ALL_SOURCES))
9696
# Omit p2-specific headers from include-all.c test.
97-
# setjmp.h is excluded because it requires a different compiler option
9897
# for exception-handling.
99-
INCLUDE_ALL_CLAUSES := -not -name wasip2.h -not -name descriptor_table.h -not -name setjmp.h
98+
INCLUDE_ALL_CLAUSES := -not -name wasip2.h -not -name descriptor_table.h
10099
endif
101100

102101
ifeq ($(WASI_SNAPSHOT), p2)
@@ -823,8 +822,10 @@ check-symbols: startup_files libc
823822
#
824823
# Generate a test file that includes all public C header files.
825824
#
825+
# setjmp.h is excluded because it requires a different compiler option
826+
#
826827
cd "$(SYSROOT_INC)" && \
827-
for header in $$(find . -type f -not -name mman.h -not -name signal.h -not -name times.h -not -name resource.h $(INCLUDE_ALL_CLAUSES) |grep -v /bits/ |grep -v /c++/); do \
828+
for header in $$(find . -type f -not -name mman.h -not -name signal.h -not -name times.h -not -name resource.h -not -name setjmp.h $(INCLUDE_ALL_CLAUSES) |grep -v /bits/ |grep -v /c++/); do \
828829
echo '#include <'$$header'>' | sed 's/\.\///' ; \
829830
done |LC_ALL=C sort >$(SYSROOT_SHARE)/include-all.c ; \
830831
cd - >/dev/null

0 commit comments

Comments
 (0)