aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2016-02-22 20:23:16 +0100
committerNicolas Schneider <nioncode+git@gmail.com>2016-02-23 01:03:33 +0100
commit1196532c0bbc617eb09cae489c0c97d145814d14 (patch)
tree84d6919ea3b8fc0df9590aaf254673edcffaa835
parent32b43e77abed69851c10577946068a0c029be908 (diff)
downloadmeson-1196532c0bbc617eb09cae489c0c97d145814d14.zip
meson-1196532c0bbc617eb09cae489c0c97d145814d14.tar.gz
meson-1196532c0bbc617eb09cae489c0c97d145814d14.tar.bz2
fix 'object generator' test case for ninja
The ninja backend uses the '/MDd' switch when the tests are run, which results in LNK4098 error, because the generator does not use the same version of the Windows runtime library.
-rwxr-xr-xtest cases/common/59 object generator/obj_generator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/common/59 object generator/obj_generator.py b/test cases/common/59 object generator/obj_generator.py
index 6960059..204f1eb 100755
--- a/test cases/common/59 object generator/obj_generator.py
+++ b/test cases/common/59 object generator/obj_generator.py
@@ -12,7 +12,7 @@ if __name__ == '__main__':
ifile = sys.argv[2]
ofile = sys.argv[3]
if compiler.endswith('cl'):
- cmd = [compiler, '/nologo', '/Fo'+ofile, '/c', ifile]
+ cmd = [compiler, '/nologo', '/MDd', '/Fo'+ofile, '/c', ifile]
else:
cmd = [compiler, '-c', ifile, '-o', ofile]
sys.exit(subprocess.call(cmd))