From 760bb39cc71b801c2c21513014b1f7d6cfb7619d Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 23 Jul 2020 13:28:24 -0700 Subject: [PATCH] Add libunwind/incldue to C include path not just C++ This should probably have been this way when it was first added in #10497 since this is a C header. A dependency on `unwind.h` was added to compiler-rt (written in C) in #11634 which means that people without clang unwind.h in their clang include directory were broken (See #11711) Fixes: #11711 --- tools/shared.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/shared.py b/tools/shared.py index b8b290330f06..fca5b6192dc3 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -815,13 +815,13 @@ def emsdk_cflags(user_args, cxx): path_from_root('system', 'local', 'include'), path_from_root('system', 'include', 'SSE'), path_from_root('system', 'lib', 'compiler-rt', 'include'), + path_from_root('system', 'lib', 'libunwind', 'include'), Cache.get_path('include') ] cxx_include_paths = [ path_from_root('system', 'include', 'libcxx'), path_from_root('system', 'lib', 'libcxxabi', 'include'), - path_from_root('system', 'lib', 'libunwind', 'include') ] def include_directive(paths):