diff options
author | Armin Weatherwax | 2011-11-13 14:31:42 +0100 |
---|---|---|
committer | Armin Weatherwax | 2011-11-13 17:10:31 +0100 |
commit | 64db97e226ec993b7336fe8ede0a00c938afdc61 (patch) | |
tree | 07b7e84743d1c6d6c7490ab1aa5e7755e244a073 /linden/scripts | |
parent | use qt/webkit 4.7.4 on linux (diff) | |
download | meta-impy-64db97e226ec993b7336fe8ede0a00c938afdc61.zip meta-impy-64db97e226ec993b7336fe8ede0a00c938afdc61.tar.gz meta-impy-64db97e226ec993b7336fe8ede0a00c938afdc61.tar.bz2 meta-impy-64db97e226ec993b7336fe8ede0a00c938afdc61.tar.xz |
Linux: allow cross compiling the 32bit viewer on a x86_64 platform
to do so: (have anything for crosscompiling installed),
export WORD_SIZE='32'
before configuring and/or building.
Be aware: Mixing several platforms in one root directory probably wont work (didn't try though).
Cross compiling the 64bit viewer on a i686 platform isn't tested, but probably will work using export WORD_SIZE='64'
Diffstat (limited to 'linden/scripts')
-rwxr-xr-x | linden/scripts/install.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/scripts/install.py b/linden/scripts/install.py index f09fc48..c69644b 100755 --- a/linden/scripts/install.py +++ b/linden/scripts/install.py | |||
@@ -805,11 +805,14 @@ def _get_platform(): | |||
805 | } | 805 | } |
806 | this_platform = platform_map[sys.platform] | 806 | this_platform = platform_map[sys.platform] |
807 | if this_platform == 'linux': | 807 | if this_platform == 'linux': |
808 | if platform.architecture()[0] == '64bit': | 808 | word_size = os.environ.get('WORD_SIZE') |
809 | if platform.architecture()[0] == '64bit' or word_size == '64': | ||
809 | # TODO -- someday when install.py accepts a platform of the form | 810 | # TODO -- someday when install.py accepts a platform of the form |
810 | # os/arch/compiler/compiler_version then we can replace the | 811 | # os/arch/compiler/compiler_version then we can replace the |
811 | # 'linux64' platform with 'linux/x86_64/gcc/4.1' | 812 | # 'linux64' platform with 'linux/x86_64/gcc/4.1' |
812 | this_platform = 'linux64' | 813 | if not word_size == '32': |
814 | this_platform = 'linux64' | ||
815 | |||
813 | return this_platform | 816 | return this_platform |
814 | 817 | ||
815 | def _getuser(): | 818 | def _getuser(): |