aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-06-24 19:03:15 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-06-24 19:03:15 +0300
commit5df1818e2b12ffa82dfa8cc0af95989a2bc1bdf9 (patch)
treed13ad15609df6d13eabefe8cc8785216b155d6c7
parentd5fb06c19352a58f717233cf67d7e9c727193854 (diff)
downloadmeson-5df1818e2b12ffa82dfa8cc0af95989a2bc1bdf9.zip
meson-5df1818e2b12ffa82dfa8cc0af95989a2bc1bdf9.tar.gz
meson-5df1818e2b12ffa82dfa8cc0af95989a2bc1bdf9.tar.bz2
MinGW fix.
-rwxr-xr-xrun_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py
index 39116b0..5f3ee5d 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -271,9 +271,11 @@ def generate_prebuilt_object():
if shutil.which('cl'):
objectfile = objectbase + 'obj'
raise RuntimeError('MSVC compilation not done yet.')
- # And neither is MinGW.
else:
- objectfile = objectbase + 'o'
+ if is_windows():
+ objectfile = objectbase + 'obj'
+ else:
+ objectfile = objectbase + 'o'
subprocess.check_call(['cc', '-c', source, '-o', objectfile])
return objectfile