commit 0e34e09fc15cde73f1b9974f2a657360abb94b4f
author Qihan Cai <qcai8733@uni.sydney.edu.au> Tue Apr 12 23:55:47 2022 +1000
committer Than McIntosh <thanm@google.com> Wed Apr 13 12:34:30 2022 +0000
tree e9b63c6781ca7ac998b8859bb6a28e0fdb3c1392
parent 2a7c04fcf6fe83a20152acc4eda92cf8e8923dab

gollvm: add /usr/{lib,lib32} to toolchain paths for arch linux

this uses Distro to make adding /usr/ path only happen if build system is running Arch Linux

Change-Id: I0b91b717a42ed643ad049ea206fa4a9f3c66df9a
Reviewed-on: https://go-review.googlesource.com/c/gollvm/+/399876
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>

driver/LinuxToolChain.cpp

diff --git a/driver/LinuxToolChain.cpp b/driver/LinuxToolChain.cpp
index 22a6120..73037f1 100644
--- a/driver/LinuxToolChain.cpp
+++ b/driver/LinuxToolChain.cpp
@@ -73,6 +73,8 @@
                                       "/../" + ftrip).str());
   addIfPathExists(fpaths, llvm::Twine(osLibDir).str());
   addIfPathExists(fpaths, llvm::Twine(osLibDir + "/" + ftrip).str());
+  if (this->distro_ == distro::DistroArchLinux)
+    addIfPathExists(fpaths, llvm::Twine("/usr/" + osLibDir).str());
 
   // Include program and file paths in verbose output.
   if (driver.args().hasArg(gollvm::options::OPT_v)) {