summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2020-05-22 17:31:59 +0200
committerBenoit Foucher <benoit@zeroc.com>2020-05-22 17:31:59 +0200
commit5c2416b9ec5b4948640d93ae4210839b8e71eff7 (patch)
tree98ea7e519a29b297ca431401cf4971648a49dccc /scripts/Util.py
parentReverted the lower timeout for the invocation retry test, fix for #859 (diff)
downloadice-5c2416b9ec5b4948640d93ae4210839b8e71eff7.tar.bz2
ice-5c2416b9ec5b4948640d93ae4210839b8e71eff7.tar.xz
ice-5c2416b9ec5b4948640d93ae4210839b8e71eff7.zip
AIX Ice 32-bits libraries are installed in lib not lib32
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 950592fbad7..796d18dc855 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -334,7 +334,10 @@ class AIX(Platform):
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")
+ if component.useBinDist(mapping, current):
+ return os.path.join(installDir, "lib")
+ else:
+ return os.path.join(installDir, "lib32" if current.config.buildPlatform == "ppc" else "lib")
def getDefaultBuildPlatform(self):
return "ppc64"