Skip to content

Makefile refactoring; NFC #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 20, 2020
Merged

Makefile refactoring; NFC #186

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b5f0fc
Use ?= for variables intended to be overridable.
sunfishcode Mar 17, 2020
b171090
Use `override` consistently for variables not meant to be overridden.
sunfishcode Mar 17, 2020
98f6b06
Omit miscellaneous comments from the build output.
sunfishcode Mar 17, 2020
beef9ba
Tidy up some comments.
sunfishcode Mar 17, 2020
2650501
Use `addprefix` to factor out a common prefix.
sunfishcode Mar 17, 2020
a52e69a
Add a comment.
sunfishcode Mar 17, 2020
eafa84c
Reorganize.
sunfishcode Mar 17, 2020
02f3180
Adjust indentation.
sunfishcode Mar 17, 2020
5bdd886
Simplify the logic for the `check` rule.
sunfishcode Mar 17, 2020
6b4f926
Remove the `override` keywords.
sunfishcode Mar 18, 2020
9f0662b
Put source file names on their own lines.
sunfishcode Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,11 +443,13 @@ finish: startup_files libc
#
mkdir -p "$(SYSROOT_SHARE)"

#
# Collect symbol information.
# TODO: Use llvm-nm --extern-only instead of grep. This is blocked on
# LLVM PR40497, which is fixed in 9.0, but not in 8.0.
# Ignore certain llvm builtin symbols such as those starting with __mul
# since these dependencies can vary between llvm versions.
#
@# TODO: Use llvm-nm --extern-only instead of grep. This is blocked on
@# LLVM PR40497, which is fixed in 9.0, but not in 8.0.
@# Ignore certain llvm builtin symbols such as those starting with __mul
@# since these dependencies can vary between llvm versions.
"$(WASM_NM)" --defined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/*.o \
|grep ' [[:upper:]] ' |sed 's/.* [[:upper:]] //' |LC_ALL=C sort > "$(SYSROOT_SHARE)/defined-symbols.txt"
for undef_sym in $$("$(WASM_NM)" --undefined-only "$(SYSROOT_LIB)"/*.a "$(SYSROOT_LIB)"/*.o \
Expand All @@ -457,27 +459,33 @@ finish: startup_files libc
grep '^_*wasi_' "$(SYSROOT_SHARE)/undefined-symbols.txt" \
> "$(SYSROOT_LIB)/libc.imports"

#
# Generate a test file that includes all public header files.
#
cd "$(SYSROOT)" && \
for header in $$(find include -type f -not -name mman.h |grep -v /bits/); do \
echo '#include <'$$header'>' | sed 's/include\///' ; \
done |LC_ALL=C sort >share/$(MULTIARCH_TRIPLE)/include-all.c ; \
cd - >/dev/null

#
# Test that it compiles.
#
"$(WASM_CC)" $(WASM_CFLAGS) -fsyntax-only "$(SYSROOT_SHARE)/include-all.c" -Wno-\#warnings

# Collect all the predefined macros, except for compiler version macros
# which we don't need to track here. For the __*_ATOMIC_*_LOCK_FREE
# macros, squash individual compiler names to attempt, toward keeping
# these files compiler-independent.
#
# We have to add `-isystem $(SYSROOT_INC)` because otherwise clang puts
# its builtin include path first, which produces compiler-specific
# output.
# Collect all the predefined macros, except for compiler version macros
# which we don't need to track here.
#
# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
# TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
@# For the __*_ATOMIC_*_LOCK_FREE macros, squash individual compiler
@# names to attempt, toward keeping these files compiler-independent.
@#
@# We have to add `-isystem $(SYSROOT_INC)` because otherwise clang puts
@# its builtin include path first, which produces compiler-specific
@# output.
@#
@# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0.
@# TODO: Filter out __FLT16_* for now, as not all versions of clang have these.
"$(WASM_CC)" $(WASM_CFLAGS) "$(SYSROOT_SHARE)/include-all.c" \
-isystem $(SYSROOT_INC) \
-E -dM -Wno-\#warnings \
Expand Down