File cling-syslibs.patch of Package llvm-cling

Overview Repositories Revisions Requests Users Attributes Meta

File cling-syslibs.patch of Package llvm-cling

--- tools/cling/lib/Interpreter/DynamicLibraryManager.cpp	2015-01-31 14:49:47.000000000 +0100
+++ tools/cling/lib/Interpreter/DynamicLibraryManager.cpp	2015-01-31 19:02:23.976106509 +0100
@@ -71,7 +71,7 @@
     static std::vector<std::string> SysPaths;
     if (!initialized) {
       // trick to get the system search path
-      std::string cmd("LD_DEBUG=libs LD_PRELOAD=DOESNOTEXIST ls 2>&1");
+      std::string cmd("env LANG=C LD_DEBUG=libs LD_PRELOAD=DOESNOTEXIST true 2>&1");
       FILE *pf = popen(cmd.c_str (), "r");
       std::string result = "";
       std::string sys_path = "";
@@ -81,9 +81,8 @@
           result += buffer;
       }
       pclose(pf);
-      std::size_t from
-        = result.find("search path=", result.find("(LD_LIBRARY_PATH)"));
       std::size_t to = result.find("(system search path)");
+      std::size_t from = result.rfind("search path=", to);
       if (from != std::string::npos && to != std::string::npos) {
         from += 12;
         sys_path = result.substr(from, to-from);

Places

File cling-syslibs.patch of Package llvm-cling

Places