commit 1c698521221a9b29c60b1b358633d9c42879fd1f
author Cherry Zhang <cherryyz@google.com> Wed Jun 13 08:15:22 2018 -0400
committer Cherry Zhang <cherryyz@google.com> Wed Jun 13 13:22:35 2018 +0000
tree 94cf6f5b4ba0a8134fa59010eab413ecdc995d93
parent ca8dc1f2b24c0f8ebf1d97a0b3a94690797c4fc9

gollvm: search install dir before system dirs in getFilePath

In case that there is an installed libgo in the system (from
gccgo installation), we want to pick our libgo instead of the
system one. This is not an issue in linking, where we do pass
our install dir before system dirs to ld, but for things like
-print-file-name.

Change-Id: I39379f5e84d40e511472176b25eef5ab182fe71f
Reviewed-on: https://go-review.googlesource.com/118635
Reviewed-by: Than McIntosh <thanm@google.com>

driver/Driver.cpp

diff --git a/driver/Driver.cpp b/driver/Driver.cpp
index 9485616..d7893f2 100644
--- a/driver/Driver.cpp
+++ b/driver/Driver.cpp
@@ -85,6 +85,12 @@
       return cand;
   }
 
+  // Examine install dir
+  llvm::SmallString<256> installed(installedLibDir());
+  llvm::sys::path::append(installed, name);
+  if (llvm::sys::fs::exists(llvm::Twine(installed)))
+    return installed.str();
+
   // Examine toolchain file paths.
   for (const auto &dir : toolchain.filePaths()) {
     llvm::SmallString<256> candidate(dir);
@@ -93,12 +99,6 @@
       return candidate.str();
   }
 
-  // System install dir
-  llvm::SmallString<256> installed(installedLibDir());
-  llvm::sys::path::append(installed, name);
-  if (llvm::sys::fs::exists(llvm::Twine(installed)))
-    return installed.str();
-
   return name;
 }