From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sun, 14 Jun 2020 22:05:08 +0200 Subject: [Buildroot] [PATCH] toolchain: adjust version check to allow for single numbers In-Reply-To: <20200610235313.204905-1-nolange79@gmail.com> References: <20200610235313.204905-1-nolange79@gmail.com> Message-ID: <20200614200508.GL2346@scaer> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Norbert, All, On 2020-06-11 01:53 +0200, Norbert Lange spake thusly: > A gcc compiler, which was configured with > --with-gcc-major-version-only, will only return a single > number. (debian does this for example). > > A simple modification allows the check to work with both > single numbers (eg. '9') and full versions (eg. '9.2.1'). > > Signed-off-by: Norbert Lange Applied to master, thanks. Regards, Yann E. MORIN. > --- > toolchain/helpers.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk > index 44d0c83d1e..17bc159f3e 100644 > --- a/toolchain/helpers.mk > +++ b/toolchain/helpers.mk > @@ -184,7 +184,7 @@ check_gcc_version = \ > exit 0 ; \ > fi; \ > real_version=`$(1) -dumpversion` ; \ > - if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \ > + if [[ ! "$${real_version}." =~ ^$${expected_version}\. ]] ; then \ > printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \ > "$${expected_version}" "$${real_version}" ; \ > exit 1 ; \ > -- > 2.26.2 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'