File clang-resourcedirs.patch of Package llvm-cling

Overview Repositories Revisions Requests Users Attributes Meta

File clang-resourcedirs.patch of Package llvm-cling (Revision 55bcc77d0bf70cd7ded845347e480132)

Currently displaying revision 55bcc77d0bf70cd7ded845347e480132 , Show latest

--- tools/clang/lib/Driver/Driver.cpp	2015-01-30 23:22:00.000000000 +0100
+++ tools/clang/lib/Driver/Driver.cpp	2015-01-31 05:07:02.757697555 +0100
@@ -64,11 +64,11 @@
 
   // Compute the path to the resource directory.
   StringRef ClangResourceDir(CLANG_RESOURCE_DIR);
-  SmallString<128> P(Dir);
+  SmallString<128> P((Dir != "") ? Dir : "/usr/bin/");
   if (ClangResourceDir != "")
     llvm::sys::path::append(P, ClangResourceDir);
   else
-    llvm::sys::path::append(P, "..", "lib", "clang", CLANG_VERSION_STRING);
+    llvm::sys::path::append(P, "..", "LLVM_LIBDIR", "cling");
   ResourceDir = P.str();
 }
 
--- tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-01-30 23:22:00.000000000 +0100
+++ tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-01-31 04:58:37.526519435 +0100
@@ -960,7 +960,7 @@
     llvm::sys::path::remove_filename(P); // Remove /bin   from foo/bin
 
     // Get foo/lib/clang/<version>/include
-    llvm::sys::path::append(P, "lib", "clang", CLANG_VERSION_STRING);
+    llvm::sys::path::append(P, "LLVM_LIBDIR", "cling");
   }
 
   return P.str();
--- tools/cling/lib/Interpreter/CIFactory.cpp	2015-01-30 23:22:15.000000000 +0100
+++ tools/cling/lib/Interpreter/CIFactory.cpp	2015-01-31 04:55:01.767028459 +0100
@@ -508,7 +508,7 @@
     llvm::SmallString<512> resource_path;
     if (llvmdir) {
       resource_path = llvmdir;
-      llvm::sys::path::append(resource_path,"lib", "clang", CLANG_VERSION_STRING);
+      llvm::sys::path::append(resource_path,"LLVM_LIBDIR", "cling");
     } else {
       // FIXME: The first arg really does need to be argv[0] on FreeBSD.
       //

Places

File clang-resourcedirs.patch of Package llvm-cling (Revision 55bcc77d0bf70cd7ded845347e480132)

Places