diff options
| -rw-r--r-- | .pylintrc | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 8 |
2 files changed, 2 insertions, 8 deletions
@@ -14,8 +14,6 @@ disable= cell-var-from-loop, consider-merging-isinstance, consider-using-f-string, - consider-using-max-builtin, - consider-using-min-builtin, consider-using-with, cyclic-import, deprecated-decorator, diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 0efc3fb..cc78639 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -517,9 +517,7 @@ class CLikeCompiler(Compiler): low = cur + 1 if low > maxint: raise mesonlib.EnvironmentException('Cross-compile check overflowed') - cur = cur * 2 + 1 - if cur > maxint: - cur = maxint + cur = min(cur * 2 + 1, maxint) high = cur else: high = cur = -1 @@ -527,9 +525,7 @@ class CLikeCompiler(Compiler): high = cur - 1 if high < minint: raise mesonlib.EnvironmentException('Cross-compile check overflowed') - cur = cur * 2 - if cur < minint: - cur = minint + cur = max(cur * 2, minint) low = cur else: # Sanity check limits given by user |