]> git.lyx.org Git - lyx.git/commitdiff
Get full version of gcc
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Wed, 12 Jun 2019 18:17:55 +0000 (20:17 +0200)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Sat, 26 Oct 2019 11:45:46 +0000 (13:45 +0200)
Recent gcc versions return a short version with -dumpversion, e.g. 9.

In this case, use -dumpfullversion, which gives something like 9.1.0.

This makes the gcc 9 detection work properly.

(cherry picked from commit 44bbd0b0ef8450f4d88dfb8c3345118f2fd14dfc)

config/lyxinclude.m4
status.23x

index 1bf9def1c3c26dd16b7cc1e59dc1e4f2d2be6300..164b2f7a89ef24cfbb80a52ba2431a3c24919ad0 100644 (file)
@@ -383,6 +383,10 @@ if test x$GXX = xyes; then
   if test x$CLANG = xno; then
     dnl Useful for global version info
     gxx_version=`${CXX} -dumpversion`
+    case $gxx_version in
+       *.*) ;;
+       *) gxx_version=`${CXX} -dumpfullversion` ;;
+    esac
     CXX_VERSION="($gxx_version)"
   else
     gxx_version=clang-$clang_version
index 23bd3edb119693c128ae1d08de0c5d0ff6f83e08..a9f823323f577d72b8d13f6d2db0028f99818ce8 100644 (file)
@@ -195,3 +195,5 @@ What's new
 
 * BUILD/INSTALLATION
 
+- avoid annoying warnings with g++ 9.
+