1 files changed, 15 insertions, 0 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 0de250ca3be..4201923e513 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -318,6 +318,13 @@ class AIX(Platform):
     def hasOpenSSL(self):
         return True
 
+    def _getLibDir(self, component, process, mapping, current):
+        installDir = component.getInstallDir(mapping, current)
+        return os.path.join(installDir, "lib32" if current.config.buildPlatform == "ppc" else "lib")
+
+    def getDefaultBuildPlatform(self):
+        return "ppc64"
+
 class Linux(Platform):
 
     def __init__(self):
@@ -1381,6 +1388,9 @@ class ProcessFromBinDir:
     def isFromBinDir(self):
         return True
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
 #
 # Executables for processes inheriting this marker class are only provided
 # as a Release executble on Windows
@@ -3139,6 +3149,11 @@ class CppMapping(Mapping):
         if not isinstance(platform, Darwin):
             libPaths.append(self.component.getLibDir(process, self, current))
 
+        # On AIX we also need to add the lib directory for the TestCommon library
+        # when testing against a binary distribution
+        if isinstance(platform, AIX) and self.component.useBinDist(self, current):
+            libPaths.append(os.path.join(self.path, "lib32" if current.config.buildPlatform == "ppc" else "lib"))
+
         #
         # Add the test suite library directories to the platform library path environment variable.
         #