Handle some compiler versions containing a dash
The version reported by e.g. x86_64-w64-mingw32-gcc on Debian bullseye looks like: gcc version 10-win32 20210110 (GCC) This ends up with detect-compiler failing with: ./detect-compiler: 30: test: Illegal number: 10-win32 This change removes the two known suffixes known to exist in GCC versions in Debian: -win32 and -posix. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mike Hommey committed
Apr 26, 2023 at 09:48 UTC
382a9464145de7c1d4f89a161184686cf8685886
1 file changed
+9
-1
detect-compiler
+9
-1
@@ -17,7 +17,15 @@ get_family() {
17
}
18
19
get_version() {
20
- get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/'
20
+ # A string that begins with a digit up to the next SP
21
+ ver=$(get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/')
22
+
23
+ # There are known -variant suffixes that do not affect the
24
+ # meaning of the main version number. Strip them.
25
+ ver=${ver%-win32}
26
+ ver=${ver%-posix}
27
+
28
+ echo "$ver"
29
}
30
31
print_flags() {