Skip to content

[interop] Avoid usage of <filesystem> #21141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hahnjo wants to merge 1 commit into from
Closed

[interop] Avoid usage of <filesystem> #21141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions interpreter/CppInterOp/lib/CppInterOp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ if(NOT WIN32 AND NOT EMSCRIPTEN)
list(APPEND link_libs dl)
endif()

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
list(APPEND link_libs stdc++fs)
endif()

# Get rid of libLLVM-X.so which is appended to the list of static libraries.
if (LLVM_LINK_LLVM_DYLIB)
set(new_libs ${link_libs})
Expand Down
4 changes: 1 addition & 3 deletions interpreter/CppInterOp/lib/CppInterOp/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
#include <cstdint>
#include <cstdio>
#include <deque>
#include <filesystem>
#include <iostream>
#include <iterator>
#include <map>
Expand Down Expand Up @@ -3338,8 +3337,7 @@ TInterp_t CreateInterpreter(const std::vector<const char*>& Args /*={}*/,
std::string MainExecutableName = sys::fs::getMainExecutable(nullptr, nullptr);
std::string ResourceDir = MakeResourcesPath();
llvm::Triple T(llvm::sys::getProcessTriple());
namespace fs = std::filesystem;
if ((!fs::is_directory(ResourceDir)) && (T.isOSDarwin() || T.isOSLinux()))
if ((!sys::fs::is_directory(ResourceDir)) && (T.isOSDarwin() || T.isOSLinux()))
ResourceDir = DetectResourceDir();

std::vector<const char*> ClingArgv = {"-resource-dir", ResourceDir.c_str(),
Expand Down
Loading