Only strip -unknown environment component

Author: jakeegan

clang/lib/Driver/ToolChain.cpp

@@ -935,10 +935,10 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
   if (auto Path = getPathForTriple(T))
     return *Path;
 
-  // On AIX, the environment component is not used in the target sub dir name.
-  if (T.isOSAIX() && T.hasEnvironment()) {
-    llvm::Triple AIXTriple(T.getArchName(), T.getVendorName(),
-                           llvm::Triple::getOSTypeName(T.getOS()));
+  if (T.isOSAIX() && T.getEnvironment() == Triple::UnknownEnvironment) {
+    // Strip unknown environment from the triple.
+    const llvm::Triple AIXTriple(llvm::Triple(T.getArchName(), T.getVendorName(),
+                                 llvm::Triple::getOSTypeName(T.getOS())));
     if (auto Path = getPathForTriple(AIXTriple))
       return *Path;
   }

clang/test/Driver/aix-print-runtime-dir.c

@@ -18,8 +18,9 @@
 
 // RUN: %clang -print-runtime-dir --target=powerpc-ibm-aix-unknown \
 // RUN:        -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir\
-// RUN:      | FileCheck --check-prefix=PRINT-RUNTIME-DIR32-PER-TARGET %s
+// RUN:      | FileCheck --check-prefix=PRINT-RUNTIME-DIR-UNKNOWN-ENV %s
 
 // PRINT-RUNTIME-DIR: lib{{/|\\}}aix{{$}}
 // PRINT-RUNTIME-DIR32-PER-TARGET: lib{{/|\\}}powerpc-ibm-aix{{$}}
 // PRINT-RUNTIME-DIR64-PER-TARGET: lib{{/|\\}}powerpc64-ibm-aix{{$}}
+// PRINT-RUNTIME-DIR-UNKNOWN-ENV: lib{{/|\\}}powerpc-ibm-aix