Skip to content

Commit 4d4a4bf

Browse files
committed
Fix logic for resource dir
1 parent 3df7988 commit 4d4a4bf

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/xinterpreter.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ using Args = std::vector<const char*>;
3737

3838
void* createInterpreter(const Args &ExtraArgs = {}) {
3939
Args ClangArgs = {/*"-xc++"*/"-v"}; // ? {"-Xclang", "-emit-llvm-only", "-Xclang", "-diagnostic-log-file", "-Xclang", "-", "-xc++"};
40-
if (std::find(ExtraArgs.begin(), ExtraArgs.end(), "-resource-dir") != ExtraArgs.end()) {
41-
std::string resource_dir = Cpp::DetectResourceDir();
42-
if (resource_dir.empty())
43-
std::cerr << "Failed to detect the resource-dir\n";
44-
ClangArgs.push_back("-resource-dir");
45-
ClangArgs.push_back(resource_dir.c_str());
40+
if (std::find(ExtraArgs.begin(), ExtraArgs.end(), "-resource-dir") == ExtraArgs.end())
41+
{
42+
std::string resource_dir = Cpp::DetectResourceDir();
43+
if (resource_dir.empty())
44+
{
45+
std::cerr << "Failed to detect the resource-dir\n";
46+
}
47+
ClangArgs.push_back("-resource-dir " + resource_dir);
4648
}
4749
std::vector<std::string> CxxSystemIncludes;
4850
Cpp::DetectSystemCompilerIncludePaths(CxxSystemIncludes);

0 commit comments

Comments
 (0)