blob: d140363a759af601681d5dfb05cc4607e88d57b4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
From 9dc1dc5559ae72026c8d33fed1e74c9612782b44 Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Sat, 4 Dec 2021 19:47:58 +0100
Subject: [PATCH] compilers.xml: use gcc --version to get version number
instead of gcc -v
The output of gcc -v is dependent on locale can thus break the regex.
See also https://github.com/AdaCore/gprconfig_kb/issues/10
---
db/compilers.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/db/compilers.xml b/db/compilers.xml
index f8909d2..eee25a2 100644
--- a/db/compilers.xml
+++ b/db/compilers.xml
@@ -22,9 +22,9 @@
<name>GCC</name>
<executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
<version>
- <external>$EXEC -v</external>
+ <external>$EXEC --version</external>
<nogrep regexp="for GNAT Pro"></nogrep>
- <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
+ <grep regexp="^gcc \(GCC\) (\S+)" group="1"></grep>
</version>
<languages>C</languages>
<target>
--
2.34.1
|