Skip to content

Commit 8422dcd

Browse files
mistydemeoTrott
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 8442d2a commit 8422dcd

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
@@ -572,8 +572,8 @@ def try_check_compiler(cc, lang):
572572

573573
values = (proc.communicate()[0].split() + ['0'] * 7)[0:7]
574574
is_clang = values[0] == '1'
575-
gcc_version = '%s.%s.%s' % tuple(values[1:1+3])
576-
clang_version = '%s.%s.%s' % tuple(values[4:4+3])
575+
gcc_version = tuple(values[1:1+3])
576+
clang_version = tuple(values[4:4+3])
577577

578578
return (True, is_clang, clang_version, gcc_version)
579579

@@ -647,13 +647,13 @@ def check_compiler(o):
647647
ok, is_clang, clang_version, gcc_version = try_check_compiler(CXX, 'c++')
648648
if not ok:
649649
warn('failed to autodetect C++ compiler version (CXX=%s)' % CXX)
650-
elif clang_version < '3.4.2' if is_clang else gcc_version < '4.8.0':
650+
elif clang_version < (3, 4, 2) if is_clang else gcc_version < (4, 8, 0):
651651
warn('C++ compiler too old, need g++ 4.8 or clang++ 3.4.2 (CXX=%s)' % CXX)
652652

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

0 commit comments

Comments
 (0)