tools build: Fix clang detection with clang >= 8.0
PATCH 1/1 tools build: Fix clang detection with clang >= 8.0
The 8.0 release of clang/llvm moved the VirtualFileSystem.h header to from clang to llvm. This change causes a compile error, causing perf to not detect clang/llvm.
Fix by including the right header for the different versions of llvm, using the older header for llvm < 8, and the new header for llvm >= 8.
--- tools/build/feature/test-clang.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/build/feature/test-clang.cpp +5 -1
@@ -1,10 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 -#include "clang/Basic/VirtualFileSystem.h" #include "clang/Driver/Driver.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/raw_ostream.h" +#if LLVM_VERSION_MAJOR >= 8 +#include "llvm/Support/VirtualFileSystem.h" +#else +#include "clang/Basic/VirtualFileSystem.h" +#endif using namespace clang; using namespace clang::driver;
Signature · 1 line
2.21.0
Quoted 9 lines · Matthew Dawson
The 8.0 release of clang/llvm moved the
VirtualFileSystem.hheader to from clang to llvm. This change causes a compile error, causing perf to not detect clang/llvm.Fix by including the right header for the different versions of llvm, using the older header for llvm < 8, and the new header for llvm >= 8.
Signed-off-by Matthew Dawson <[email protected]>
Specifically the header was moved in svn revision r344140. llvmorg-8.0.0 was tagged off of r356365, while llvmorg-7.0.0 is tagged off of r342383.
Quoted 21 lines
--- tools/build/feature/test-clang.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)tools/build/feature/test-clang.cpp +5
-1@@ -1,10 +1,14 @@ // SPDX-License-Identifier: GPL-2.0 -#include "clang/Basic/VirtualFileSystem.h" #include "clang/Driver/Driver.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/raw_ostream.h" +#if LLVM_VERSION_MAJOR >= 8 +#include "llvm/Support/VirtualFileSystem.h" +#else +#include "clang/Basic/VirtualFileSystem.h" +#endif
Signature · 2 lines
Thanks, ~Nick Desaulniers