From 8df0d4cd6a559b58d4a34b738a5a766b567448cf Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 12 Jul 2019 02:21:15 -0700 Subject: [PATCH] Fix predefined macros check after recent clang change This is an alternative to #75. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index c6170ca88..843c38597 100644 --- a/Makefile +++ b/Makefile @@ -467,9 +467,15 @@ finish: startup_files libc # 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. + # # 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 \ -D_ALL_SOURCE \ -U__llvm__ \