diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-14 14:46:43 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-14 14:46:43 +0000 |
| commit | 0f63823d473bf956ec5bddf06da6e4b591e994f8 (patch) | |
| tree | c8fa2b17686616a7443c583e09bbf6eceec883c2 /mesalib/common.py | |
| parent | 9acb2b3cd11b530debce5008074fa03587ac3331 (diff) | |
| parent | 026b85e62b3d8812afb5f04df29aeac28c52b331 (diff) | |
| download | vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.gz vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.bz2 vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/common.py')
| -rw-r--r-- | mesalib/common.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/mesalib/common.py b/mesalib/common.py index c82e06325..4f1fef81b 100644 --- a/mesalib/common.py +++ b/mesalib/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'
|