diff options
| author | José Fonseca <jfonseca@vmware.com> | 2011-02-11 16:44:13 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2011-02-11 20:09:26 +0000 |
| commit | ae760279f142244590c8aa76e3139529ca42952f (patch) | |
| tree | d293943af92cd7514536d9506d52858bf772225c /common.py | |
| parent | 051f8bbfee6618e8bf04712cf214d96cec433e38 (diff) | |
| download | mesa-ae760279f142244590c8aa76e3139529ca42952f.tar.gz mesa-ae760279f142244590c8aa76e3139529ca42952f.tar.bz2 mesa-ae760279f142244590c8aa76e3139529ca42952f.zip | |
scons: Try to support building 64bit binaries on 32bit windows.
Diffstat (limited to 'common.py')
| -rw-r--r-- | common.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/common.py b/common.py index cbb61629d27..e7941262e52 100644 --- a/common.py +++ b/common.py @@ -14,13 +14,7 @@ import SCons.Script.SConscript ####################################################################### # Defaults -_platform_map = { - 'linux2': 'linux', - 'win32': 'windows', -} - -host_platform = sys.platform -host_platform = _platform_map.get(host_platform, host_platform) +host_platform = _platform.system().lower() # Search sys.argv[] for a "platform=foo" argument since we don't have # an 'env' variable at this point. @@ -29,8 +23,6 @@ if 'platform' in SCons.Script.ARGUMENTS: else: target_platform = host_platform -cross_compiling = target_platform != host_platform - _machine_map = { 'x86': 'x86', 'i386': 'x86', @@ -52,7 +44,7 @@ host_machine = _machine_map.get(host_machine, 'generic') default_machine = host_machine default_toolchain = 'default' -if target_platform == 'windows' and cross_compiling: +if target_platform == 'windows' and host_platform != 'windows': default_machine = 'x86' default_toolchain = 'crossmingw' |