gprbuild/0002-compilers.xml-use-gcc-version-to-get-version-number.patch
2025-05-17 23:04:25 +02:00

33 lines
1.2 KiB
Diff

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