diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 3516ac7..3afe3cd 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -467,7 +467,7 @@ class Vs2010Backend(backends.Backend): for l, args in target.extra_args.items(): if l in extra_args: extra_args[l] += args - general_args = compiler.get_buildtype_args(self.buildtype) + general_args = compiler.get_buildtype_args(self.buildtype).copy() # FIXME all the internal flags of VS (optimization etc) are represented # by their own XML elements. In theory we should split all flags to those # that have an XML element and those that don't and serialise them diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index f1868dd..3079c5e 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -574,7 +574,7 @@ int main(int argc, char **argv) { ''' res = self.run(templ % (prefix, element), extra_args) if not res.compiled: - raise EnvironmentException('Could not compile sizeof test.') + return -1 if res.returncode != 0: raise EnvironmentException('Could not run sizeof test binary.') return int(res.stdout) |