diff options
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 2 | ||||
| -rw-r--r-- | test cases/common/138 compute int/meson.build | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index ce3d9d7..b5992ef 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -423,7 +423,7 @@ class CLikeCompiler: cur = maxint high = cur else: - low = cur = -1 + high = cur = -1 while self._compile_int('%s < %d' % (expression, cur), prefix, env, extra_args, dependencies): high = cur - 1 if high < minint: diff --git a/test cases/common/138 compute int/meson.build b/test cases/common/138 compute int/meson.build index 22bd266..89f4746 100644 --- a/test cases/common/138 compute int/meson.build +++ b/test cases/common/138 compute int/meson.build @@ -10,6 +10,9 @@ foobar = cc.compute_int('FOOBAR_IN_FOOBAR_H', prefix : '#include "foobar.h"', in maxint = cc.compute_int('INT_MAX', prefix: '#include <limits.h>') minint = cc.compute_int('INT_MIN', prefix: '#include <limits.h>') +# Regression test for the special case -1 that used to fail when cross compiling +assert(cc.compute_int('-1') == -1, 'compute_int(-1) failed') + cd = configuration_data() cd.set('INTSIZE', intsize) cd.set('FOOBAR', foobar) |