From: Michał Kępień <michal@isc.org>
Date: Mon, 18 May 2020 08:23:06 +0000 (+0200)
Subject: Make GCC version extraction work with GCC 10
X-Git-Tag: v9.17.2~70^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b48eec79fb272715c3b7070edb601956b86aa70;p=thirdparty%2Fbind9.git

Make GCC version extraction work with GCC 10

Add whitespace to the regular expression used for extracting the GCC
version from "gcc --version" output so that it works properly with
multi-digit major version numbers.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ac064de4e3..de72ea5a904 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@ stages:
   script:
     - *configure
     - (make -nwk all || true) | compiledb
-    - export GCC_VERSION=$(gcc --version | sed -n 's/.*\([0-9]\+\)\.[0-9]\+\.[0-9]\+.*/\1/p')
+    - export GCC_VERSION=$(gcc --version | sed -n 's/.* \([0-9]\+\)\.[0-9]\+\.[0-9]\+.*/\1/p')
     - sed -i "/gcc\",/a\"-DCPPCHECK\", \"-D__STDC__\", \"-D__GNUC__=${GCC_VERSION}\"," compile_commands.json
     - *run_cppcheck
   after_script: