From: LLVM Packaging Team Date: Sat, 7 Mar 2020 00:01:35 +0000 (+0000) Subject: bootstrap-fix-include-next X-Git-Tag: archive/raspbian/1%9.0.1-10+rpi1^2~14 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6fa1b5a6edbe86be4626ea440ce25df33eefdc4a;p=llvm-toolchain-9.git bootstrap-fix-include-next When doing a bootstrap, we use a newly built clang. When this one is used, if already installed on the system, we have clang header in two places: llvm-toolchain-7-7/build-llvm/lib/clang/7.0.0/include/inttypes.h and /usr/include/clang/7.0.0/include/inttypes.h Because clang expects only one of his headers to be available, it uses include_next to get the glibc (libc6-dev package) header. However, in the previous example, because we have inttypes.h twice in the include search path, clang's header will call itself without any effect. Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H) Gbp-Pq: Name bootstrap-fix-include-next.diff --- diff --git a/clang/lib/Headers/inttypes.h b/clang/lib/Headers/inttypes.h index 1c894c4ac..eac373cf2 100644 --- a/clang/lib/Headers/inttypes.h +++ b/clang/lib/Headers/inttypes.h @@ -6,7 +6,7 @@ * \*===----------------------------------------------------------------------===*/ -#ifndef __CLANG_INTTYPES_H +#if !defined(__CLANG_INTTYPES_H) || !defined(_INTTYPES_H) // AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T // is defined until an inclusion of it without _STD_TYPES_T occurs, in which // case the header guard macro is defined. diff --git a/clang/lib/Headers/limits.h b/clang/lib/Headers/limits.h index c653580ba..7ed487241 100644 --- a/clang/lib/Headers/limits.h +++ b/clang/lib/Headers/limits.h @@ -6,7 +6,7 @@ * \*===----------------------------------------------------------------------===*/ -#ifndef __CLANG_LIMITS_H +#if !defined(__CLANG_LIMITS_H) || !defined(_LIBC_LIMITS_H_) #define __CLANG_LIMITS_H /* The system's limits.h may, in turn, try to #include_next GCC's limits.h.