From 90232b2ecd72422fbaad5ea53679f27f59249d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 22 Oct 2020 09:08:33 +0000 Subject: [PATCH] [libcxx] [test] Don't pass INCLUDE to clang via -isystem Passing the MSVC include dirs via -isystem makes them included before clang's own include resource dir (/lib/clang//include). This causes includes of stddef.h to bypass clang's stddef.h which defines max_align_t, which libc++ needs defined. This was added in 4372f06d0fcaba1a6913e2f37be064e06a7b5b5b when the initial windows testing support was added, and has been brought along since. It's unclear if this was needed back then - now it no longer is needed at least, and since libc++ started depending on max_align_t, this became an issue. Differential Revision: https://reviews.llvm.org/D97167 --- libcxx/utils/libcxx/test/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index e78303c22b9d1a..8e40a794a87dd0 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -204,7 +204,7 @@ def _prefixed_env_list(var, prefix): assert self.cxx_is_clang_cl flags = [] - compile_flags = _prefixed_env_list('INCLUDE', '-isystem') + compile_flags = [] link_flags = _prefixed_env_list('LIB', '-L') for path in _split_env_var('LIB'): self.add_path(self.exec_env, path)