OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clc: fix compilation error with llvm-20

Browse Source 
LLVM commit:
924a7d83b4

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11814
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30980>
This commit is contained in:
Karol Herbst
2024-09-02 16:57:08 +02:00
committed by Marge Bot
parent d16581652f
commit 14ebecd787
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/clc/clc_helpers.cpp
View File

@@ -886,10 +886,16 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
return {}; return {};
} }
// GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary // GetResourcePath is a way to retrieve the actual libclang resource dir based on a given binary
// or library. // or library.
auto clang_res_path = auto tmp_res_path =
fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; #if LLVM_VERSION_MAJOR >= 20
Driver::GetResourcesPath(std::string(clang_path));
#else
Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR);
#endif
auto clang_res_path = fs::path(tmp_res_path) / "include";
free(clang_path); free(clang_path);
c->getHeaderSearchOpts().UseBuiltinIncludes = true; c->getHeaderSearchOpts().UseBuiltinIncludes = true;