[PATCH] D127310: [clang][driver] fix to correctly set devtoolset on RHEL

Quinn Pham via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Wed Jun 8 10:19:17 PDT 2022


quinnp updated this revision to Diff 435239.
quinnp added a comment.

Addressing review comments.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D127310/new/

https://reviews.llvm.org/D127310

Files:
  clang/lib/Driver/ToolChains/Gnu.cpp


Index: clang/lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Gnu.cpp
+++ clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2153,8 +2153,10 @@
       }
     }
 
-    if (ChosenToolsetVersion > 0)
+    if (ChosenToolsetVersion > 0) {
       Prefixes.push_back(ChosenToolsetDir);
+      Prefixes.push_back(ChosenToolsetDir + "/root/usr");
+    }
   }
 
   // Fall back to /usr which is used by most non-Solaris systems.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D127310.435239.patch
Type: text/x-patch
Size: 489 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220608/accd862f/attachment-0001.bin>


More information about the cfe-commits mailing list