diff options
| author | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
| commit | fc886b010c01cccb8cca3ac4d92f1ebd7fc72295 (patch) | |
| tree | 51cf00a4a955efecc9c94527aeafcb25ffbe57b9 /scripts/IceBoxUtil.py | |
| parent | Simplify OutputStream creation (diff) | |
| parent | Fixed non-thread safe AMD dispatch, fixes #448 (#449) (diff) | |
| download | ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.bz2 ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.xz ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'scripts/IceBoxUtil.py')
| -rw-r--r-- | scripts/IceBoxUtil.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/IceBoxUtil.py b/scripts/IceBoxUtil.py index 7fe14976af2..b9c598bc5c9 100644 --- a/scripts/IceBoxUtil.py +++ b/scripts/IceBoxUtil.py @@ -45,6 +45,9 @@ class IceBox(ProcessFromBinDir, Server): platform.getLinuxId() in ["centos", "rhel", "fedora"] and \ current.config.buildPlatform == "x86": name += "32" # Multilib platform + if isinstance(platform, AIX) and \ + current.config.buildPlatform == "ppc": + name += "_32" if current.config.cpp11: name += "++11" return name @@ -75,5 +78,8 @@ class IceBoxAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, Client): return "IceBox.Admin" elif isinstance(mapping, JavaMapping): return "com.zeroc.IceBox.Admin" + elif isinstance(platform, AIX) and \ + current.config.buildPlatform == "ppc": + return "iceboxadmin_32" else: return "iceboxadmin" |