From 13f33c5999810111ba5f7290a487e88216e4e01a Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Fri, 8 Nov 2024 16:20:59 +0530 Subject: [PATCH 1/3] Fix finding Resource Dir --- src/xinterpreter.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp index 507a7bde..936f8dc4 100644 --- a/src/xinterpreter.cpp +++ b/src/xinterpreter.cpp @@ -37,7 +37,11 @@ using Args = std::vector; 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()) { + auto it = std::find_if(ExtraArgs.begin(), ExtraArgs.end(), [](const char* arg) { + return std::strcmp(arg, "-resource-dir") == 0; + }); + + if (it == ExtraArgs.end()) { std::string resource_dir = Cpp::DetectResourceDir(); if (resource_dir.empty()) std::cerr << "Failed to detect the resource-dir\n"; From b24ec8effa1de8701e7904c09fc5d7d2176802d3 Mon Sep 17 00:00:00 2001 From: Anutosh Bhat <87052487+anutosh491@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:40:12 +0530 Subject: [PATCH 2/3] Update src/xinterpreter.cpp Co-authored-by: Vassil Vassilev --- src/xinterpreter.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp index 936f8dc4..d404e57b 100644 --- a/src/xinterpreter.cpp +++ b/src/xinterpreter.cpp @@ -37,11 +37,8 @@ using Args = std::vector; void* createInterpreter(const Args &ExtraArgs = {}) { Args ClangArgs = {/*"-xc++"*/"-v"}; // ? {"-Xclang", "-emit-llvm-only", "-Xclang", "-diagnostic-log-file", "-Xclang", "-", "-xc++"}; - auto it = std::find_if(ExtraArgs.begin(), ExtraArgs.end(), [](const char* arg) { - return std::strcmp(arg, "-resource-dir") == 0; - }); - - if (it == ExtraArgs.end()) { + if (std::find_if(ExtraArgs.begin(), ExtraArgs.end(), [](std::string s) { + return s == "-resource-dir";}) == ExtraArgs.end()) { std::string resource_dir = Cpp::DetectResourceDir(); if (resource_dir.empty()) std::cerr << "Failed to detect the resource-dir\n"; From 0bca94ef2d5b0dab9501ec9f4bfe0b29dae063d2 Mon Sep 17 00:00:00 2001 From: Anutosh Bhat <87052487+anutosh491@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:46:43 +0530 Subject: [PATCH 3/3] Update src/xinterpreter.cpp Co-authored-by: Vassil Vassilev --- src/xinterpreter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp index d404e57b..2a8084f8 100644 --- a/src/xinterpreter.cpp +++ b/src/xinterpreter.cpp @@ -37,7 +37,7 @@ using Args = std::vector; void* createInterpreter(const Args &ExtraArgs = {}) { Args ClangArgs = {/*"-xc++"*/"-v"}; // ? {"-Xclang", "-emit-llvm-only", "-Xclang", "-diagnostic-log-file", "-Xclang", "-", "-xc++"}; - if (std::find_if(ExtraArgs.begin(), ExtraArgs.end(), [](std::string s) { + if (std::find_if(ExtraArgs.begin(), ExtraArgs.end(), [](const std::string& s) { return s == "-resource-dir";}) == ExtraArgs.end()) { std::string resource_dir = Cpp::DetectResourceDir(); if (resource_dir.empty())