Skip to content

Commit 2ec7dd4

Browse files
mistydemeorvagg
authored andcommitted
build: fix configure script for double-digits
Compare versions using tuples instead of strings so that it is future-proofed against versions that contain a number that is more than one digit. PR-URL: #21183 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
1 parent 7a35e18 commit 2ec7dd4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,8 @@ def try_check_compiler(cc, lang):
607607

608608
values = (proc.communicate()[0].split() + ['0'] * 7)[0:7]
609609
is_clang = values[0] == '1'
610-
gcc_version = '%s.%s.%s' % tuple(values[1:1+3])
611-
clang_version = '%s.%s.%s' % tuple(values[4:4+3])
610+
gcc_version = tuple(values[1:1+3])
611+
clang_version = tuple(values[4:4+3])
612612

613613
return (True, is_clang, clang_version, gcc_version)
614614

@@ -682,13 +682,13 @@ def check_compiler(o):
682682
ok, is_clang, clang_version, gcc_version = try_check_compiler(CXX, 'c++')
683683
if not ok:
684684
warn('failed to autodetect C++ compiler version (CXX=%s)' % CXX)
685-
elif clang_version < '3.4.2' if is_clang else gcc_version < '4.9.4':
685+
elif clang_version < (3, 4, 2) if is_clang else gcc_version < (4, 9, 4):
686686
warn('C++ compiler too old, need g++ 4.9.4 or clang++ 3.4.2 (CXX=%s)' % CXX)
687687

688688
ok, is_clang, clang_version, gcc_version = try_check_compiler(CC, 'c')
689689
if not ok:
690690
warn('failed to autodetect C compiler version (CC=%s)' % CC)
691-
elif not is_clang and gcc_version < '4.2.0':
691+
elif not is_clang and gcc_version < (4, 2, 0):
692692
# clang 3.2 is a little white lie because any clang version will probably
693693
# do for the C bits. However, we might as well encourage people to upgrade
694694
# to a version that is not completely ancient.

0 commit comments

Comments
 (0)