Skip to content

Only inject -resource-dir when we actually have a path #950

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

Open
guitargeek wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Only inject -resource-dir when we actually have a path #950

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
6 changes: 4 additions & 2 deletions lib/CppInterOp/CppInterOp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,8 +3812,10 @@ TInterp_t CreateInterpreter(const std::vector<const char*>& Args /*={}*/,
(T.isOSDarwin() || T.isOSLinux()))
ResourceDir = DetectResourceDir();

std::vector<const char*> ClingArgv = {"-resource-dir", ResourceDir.c_str(),
"-std=c++14"};
std::vector<const char*> ClingArgv = {"-std=c++14"};
if (!ResourceDir.empty()) {
ClingArgv.insert(ClingArgv.begin(), {"-resource-dir", ResourceDir.c_str()});
}
Comment on lines +3816 to +3818
Copy link
Copy Markdown
Contributor

@vgvassilev vgvassilev May 2, 2026

Choose a reason for hiding this comment

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

Suggested change
if (!ResourceDir.empty()) {
ClingArgv.insert(ClingArgv.begin(), {"-resource-dir", ResourceDir.c_str()});
}
if (!ResourceDir.empty())
ClingArgv.insert(ClingArgv.begin(), {"-resource-dir", ResourceDir.c_str()});

ClingArgv.insert(ClingArgv.begin(), MainExecutableName.c_str());
#ifdef _WIN32
// FIXME : Workaround Sema::PushDeclContext assert on windows
Expand Down
Loading