fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-19 13:38:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clc: do not use std::filesystem

Browse source 
It seems like davinci resolve conflicts on those symbols and we got
regressions from our static libstdc++ linking workaround.

Cc: mesa-stable
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41488>
This commit is contained in:
Karol Herbst 2026-05-11 17:14:16 +02:00 • committed by Marge Bot
parent 054dd22eb6
commit c3832060a4
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/compiler/clc/clc_helpers.cpp
View file

@ -24,7 +24,6 @@
// OTHER DEALINGS IN THE SOFTWARE.
#include <cstdlib>
#include <filesystem>
#include <sstream>
#include <mutex>
@ -93,8 +92,6 @@
#include "clc_helpers.h"
namespace fs = std::filesystem;
/* Use the highest version of SPIRV supported by SPIRV-Tools. */
constexpr spv_target_env spirv_target = SPV_ENV_UNIVERSAL_1_6;
@ -930,22 +927,22 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx,
#else
Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR);
#endif
auto clang_res_path = fs::path(tmp_res_path) / "include";
auto clang_res_path = tmp_res_path + "/include";
free(clang_path);
c->getHeaderSearchOpts().UseBuiltinIncludes = true;
c->getHeaderSearchOpts().UseStandardSystemIncludes = true;
c->getHeaderSearchOpts().ResourceDir = clang_res_path.string();
c->getHeaderSearchOpts().ResourceDir = clang_res_path;
// Add opencl-c generic search path
c->getHeaderSearchOpts().AddPath(clang_res_path.string(),
c->getHeaderSearchOpts().AddPath(clang_res_path,
clang::frontend::Angled,
false, false);
auto clang_install_res_path =
fs::path(LLVM_LIB_DIR) / "clang" / std::to_string(LLVM_VERSION_MAJOR) / "include";
c->getHeaderSearchOpts().AddPath(clang_install_res_path.string(),
std::string(LLVM_LIB_DIR) + "/clang/" + std::to_string(LLVM_VERSION_MAJOR) + "/include";
c->getHeaderSearchOpts().AddPath(clang_install_res_path,
clang::frontend::Angled,
false, false);
#endif