diff options
| author | Mike Hommey <mh@glandium.org> | 2023-04-26 02:48:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-26 18:20:50 +0200 |
| commit | 382a9464145de7c1d4f89a161184686cf8685886 (patch) | |
| tree | 2be4bb5fcde102354b319e9e526f89fee74c932a /detect-compiler | |
| parent | The thirteenth batch (diff) | |
| download | git-382a9464145de7c1d4f89a161184686cf8685886.tar.xz git-382a9464145de7c1d4f89a161184686cf8685886.zip | |
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>
Diffstat (limited to 'detect-compiler')
| -rwxr-xr-x | detect-compiler | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/detect-compiler b/detect-compiler index 50087f5670..a87650b71b 100755 --- a/detect-compiler +++ b/detect-compiler @@ -17,7 +17,15 @@ get_family() { } get_version() { - get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/' + # A string that begins with a digit up to the next SP + ver=$(get_version_line | sed 's/^.* version \([0-9][^ ]*\).*/\1/') + + # There are known -variant suffixes that do not affect the + # meaning of the main version number. Strip them. + ver=${ver%-win32} + ver=${ver%-posix} + + echo "$ver" } print_flags() { |