@@ -28,11 +28,7 @@ using Args = std::vector<const char*>;
2828
2929void * createInterpreter (const  Args& ExtraArgs = {})
3030{
31-     Args ClangArgs = {/* "-xc++"*/   " -v"  };  //  ? {"-Xclang", "-emit-llvm-only", "-Xclang",
32-                                           //  "-diagnostic-log-file", "-Xclang", "-", "-xc++"};
33- #ifdef  EMSCRIPTEN
34-     ClangArgs.push_back (" -std=c++20"  );
35- #else 
31+     Args ClangArgs = {/* "-xc++"*/   " -v"  };
3632    if  (std::find_if (
3733            ExtraArgs.begin (),
3834            ExtraArgs.end (),
@@ -44,12 +40,15 @@ void* createInterpreter(const Args& ExtraArgs = {})
4440        == ExtraArgs.end ())
4541    {
4642        std::string resource_dir = Cpp::DetectResourceDir ();
47-         if  (resource_dir.empty ())
43+         if  (!resource_dir.empty ())
44+         {
45+             ClangArgs.push_back (" -resource-dir"  );
46+             ClangArgs.push_back (resource_dir.c_str ());
47+         }
48+         else 
4849        {
4950            std::cerr << " Failed to detect the resource-dir\n "  ;
5051        }
51-         ClangArgs.push_back (" -resource-dir"  );
52-         ClangArgs.push_back (resource_dir.c_str ());
5352    }
5453    std::vector<std::string> CxxSystemIncludes;
5554    Cpp::DetectSystemCompilerIncludePaths (CxxSystemIncludes);
@@ -58,7 +57,6 @@ void* createInterpreter(const Args& ExtraArgs = {})
5857        ClangArgs.push_back (" -isystem"  );
5958        ClangArgs.push_back (CxxInclude.c_str ());
6059    }
61- #endif 
6260    ClangArgs.insert (ClangArgs.end (), ExtraArgs.begin (), ExtraArgs.end ());
6361    //  FIXME: We should process the kernel input options and conditionally pass
6462    //  the gpu args here.
0 commit comments