diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-11-28 12:54:14 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-11-28 12:54:14 +0100 |
| commit | c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084 (patch) | |
| tree | dafc2a03552cc57150c215881f95909a7e55cb54 /demoscript/Util.py | |
| parent | Fixed ICE-5015 - Python 3 support and fix for running ruby/php tests on Windows (diff) | |
| download | ice-c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084.tar.bz2 ice-c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084.tar.xz ice-c9c3c1d6abecfebddcc378e80f8e6fc8cd1ce084.zip | |
Fixed ICE-5020 - x64 libraries now installed in lib/64 on Sparc
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index f099c33e189..2ad87a7c129 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -111,7 +111,7 @@ def configurePaths(): binDir = os.path.join(binDir, "x64") elif isSolaris(): if isSparc(): - libDir = os.path.join(libDir, "sparcv9") + libDir = os.path.join(libDir, "64") binDir = os.path.join(binDir, "sparcv9") else: libDir = os.path.join(libDir, "amd64") @@ -216,9 +216,9 @@ def isSolaris(): return sys.platform == "sunos5" def isSparc(): - p = os.popen("uname -m") + p = os.popen("uname -p") l = p.readline().strip() - if l == "sun4u": + if l == "sparc": return True else: return False |