From: Paul Scoropan <1paulscoropan@gmail.com>
Date: Wed, 25 Jan 2023 23:23:42 +0000 (+0000)
Subject: [flang] Add driver install directory to AIX toolchain program paths list.
X-Git-Tag: upstream/17.0.6~19565
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e72407635a43b8b7f85c1658b6738f023a21f03;p=platform%2Fupstream%2Fllvm.git

[flang] Add driver install directory to AIX toolchain program paths list.

flang-new encounters an issue where its unable to invoke itself because the
install directory was missing from the program paths on AIX.

Reviewed By: w2yehia

Differential Revision: https://reviews.llvm.org/D140628
---

diff --git a/clang/lib/Driver/ToolChains/AIX.cpp b/clang/lib/Driver/ToolChains/AIX.cpp
index abbd3ef..f62b566 100644
--- a/clang/lib/Driver/ToolChains/AIX.cpp
+++ b/clang/lib/Driver/ToolChains/AIX.cpp
@@ -287,6 +287,10 @@ void aix::Linker::ConstructJob(Compilation &C, const JobAction &JA,
 /// AIX - AIX tool chain which can call as(1) and ld(1) directly.
 AIX::AIX(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
     : ToolChain(D, Triple, Args) {
+  getProgramPaths().push_back(getDriver().getInstalledDir());
+  if (getDriver().getInstalledDir() != getDriver().Dir)
+    getProgramPaths().push_back(getDriver().Dir);
+
   ParseInlineAsmUsingAsmParser = Args.hasFlag(
       options::OPT_fintegrated_as, options::OPT_fno_integrated_as, true);
   getLibraryPaths().push_back(getDriver().SysRoot + "/usr/lib");