aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-09-25 11:11:51 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-09-27 00:27:38 +0530
commitbcf20af62e4263c2841f8e1ea4f515d7fc6ec51a (patch)
treed5def55cbe4b9facc51dfc7b23a1153ad3e8b925 /mesonbuild/environment.py
parenta001fa0fb64a3c745f6925cbccacfb1afcfd0e21 (diff)
downloadmeson-bcf20af62e4263c2841f8e1ea4f515d7fc6ec51a.zip
meson-bcf20af62e4263c2841f8e1ea4f515d7fc6ec51a.tar.gz
meson-bcf20af62e4263c2841f8e1ea4f515d7fc6ec51a.tar.bz2
environment: Add support for MinGW/GCC to detect_windows_arch()
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 4166bda..e411687 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -110,9 +110,8 @@ def detect_windows_arch(compilers):
platform = os.environ.get('Platform', 'x86').lower()
if platform == 'x86':
return platform
- if compiler.id == 'gcc':
- # TODO: Implement this
- pass
+ if compiler.id == 'gcc' and compiler.has_define('__i386__'):
+ return 'x86'
return os_arch
def detect_cpu_family(compilers):