Re: [PATCH] tools build: Fix test-clang.cpp with Clang 8+

From: Arnaldo Carvalho de Melo
Date: Mon Jan 06 2020 - 17:16:15 EST


Em Sat, Dec 28, 2019 at 06:13:13PM +0100, Maciej S. Szmigiero escreveu:
> LLVM rL344140 (included in Clang 8+) moved VFS from Clang to LLVM, so paths
> to its include files have changed.
> This broke the Clang test in tools/build - let's fix it.

Thanks, applied.

- Arnaldo

> Signed-off-by: Maciej S. Szmigiero <mail@xxxxxxxxxxxxxxxxxxxxx>
> ---
> tools/build/feature/test-clang.cpp | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/tools/build/feature/test-clang.cpp b/tools/build/feature/test-clang.cpp
> index a2b3f092d2f0..7d87075cd1c5 100644
> --- a/tools/build/feature/test-clang.cpp
> +++ b/tools/build/feature/test-clang.cpp
> @@ -1,9 +1,15 @@
> // SPDX-License-Identifier: GPL-2.0
> +#include "clang/Basic/Version.h"
> +#if CLANG_VERSION_MAJOR < 8
> #include "clang/Basic/VirtualFileSystem.h"
> +#endif
> #include "clang/Driver/Driver.h"
> #include "clang/Frontend/TextDiagnosticPrinter.h"
> #include "llvm/ADT/IntrusiveRefCntPtr.h"
> #include "llvm/Support/ManagedStatic.h"
> +#if CLANG_VERSION_MAJOR >= 8
> +#include "llvm/Support/VirtualFileSystem.h"
> +#endif
> #include "llvm/Support/raw_ostream.h"
>
> using namespace clang;

--

- Arnaldo