Skip to content

Fix logic for resource dir flag #168

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
wants to merge 5 commits into from
Closed

Fix logic for resource dir flag #168

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd95962
Fix logic for resource dir
anutosh491 Nov 5, 2024
bb04af6
Update xinterpreter.cpp
anutosh491 Nov 5, 2024
bca51de
Update xinterpreter.cpp
anutosh491 Nov 5, 2024
1e97ac7
Update xinterpreter.cpp
anutosh491 Nov 5, 2024
79945ae
Update xinterpreter.cpp
anutosh491 Nov 5, 2024
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
15 changes: 9 additions & 6 deletions src/xinterpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ using Args = std::vector<const char*>;

void* createInterpreter(const Args &ExtraArgs = {}) {
Args ClangArgs = {/*"-xc++"*/"-v"}; // ? {"-Xclang", "-emit-llvm-only", "-Xclang", "-diagnostic-log-file", "-Xclang", "-", "-xc++"};
if (std::find(ExtraArgs.begin(), ExtraArgs.end(), "-resource-dir") != ExtraArgs.end()) {
std::string resource_dir = Cpp::DetectResourceDir();
if (resource_dir.empty())
std::cerr << "Failed to detect the resource-dir\n";
ClangArgs.push_back("-resource-dir");
ClangArgs.push_back(resource_dir.c_str());
if (std::find(ExtraArgs.begin(), ExtraArgs.end(), "-resource-dir") == ExtraArgs.end())
{
std::string resource_dir = Cpp::DetectResourceDir();
if (resource_dir.empty())
{
std::cerr << "Failed to detect the resource-dir\n";
}
ClangArgs.push_back("-resource-dir");
ClangArgs.push_back(resource_dir.c_str());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make this patch one line as it should be.

}
std::vector<std::string> CxxSystemIncludes;
Cpp::DetectSystemCompilerIncludePaths(CxxSystemIncludes);
Expand Down
Loading