@@ -612,8 +612,8 @@ def try_check_compiler(cc, lang):
612
612
613
613
values = (proc.communicate()[0].split() + [' 0' ] * 7)[0:7]
614
614
is_clang = values[0] == ' 1'
615
- gcc_version = ' %s.%s.%s ' % tuple(values[1:1+3])
616
- clang_version = ' %s.%s.%s ' % tuple(values[4:4+3])
615
+ gcc_version = tuple(values[1:1+3])
616
+ clang_version = tuple(values[4:4+3])
617
617
618
618
return (True, is_clang, clang_version, gcc_version)
619
619
@@ -707,13 +707,13 @@ def check_compiler(o):
707
707
ok, is_clang, clang_version, gcc_version = try_check_compiler(CXX, ' c++' )
708
708
if not ok:
709
709
warn(' failed to autodetect C++ compiler version (CXX=%s)' % CXX)
710
- elif clang_version < ' 3.4.2 ' if is_clang else gcc_version < ' 4.9.4 ' :
710
+ elif clang_version < (3, 4, 2) if is_clang else gcc_version < (4, 9, 4) :
711
711
warn(' C++ compiler too old, need g++ 4.9.4 or clang++ 3.4.2 (CXX=%s)' % CXX)
712
712
713
713
ok, is_clang, clang_version, gcc_version = try_check_compiler(CC, ' c' )
714
714
if not ok:
715
715
warn(' failed to autodetect C compiler version (CC=%s)' % CC)
716
- elif not is_clang and gcc_version < ' 4.2.0 ' :
716
+ elif not is_clang and gcc_version < (4, 2, 0) :
717
717
# clang 3.2 is a little white lie because any clang version will probably
718
718
# do for the C bits. However, we might as well encourage people to upgrade
719
719
# to a version that is not completely ancient.
0 commit comments