From 6b10922d6e710f93c99cf2aef10c011a0f9351db Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sun, 17 May 2020 11:05:52 +0200
Subject: [PATCH] Fixing detection of gcc 10
---
openfpm_numerics | 2 +-
script/detect_gcc | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openfpm_numerics b/openfpm_numerics
index 66722baf6..f40646981 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit 66722baf65bc0088d93624d86f5ab74852b3c1d8
+Subproject commit f4064698120542c01b9d2fbf3a64711ec1c9ee64
diff --git a/script/detect_gcc b/script/detect_gcc
index 0b8ecfcc8..c7d023596 100755
--- a/script/detect_gcc
+++ b/script/detect_gcc
@@ -114,9 +114,9 @@ function detect_compiler()
g++ --version | grep "g++" > /dev/null 2>&1
if [ $? == 0 -a $gpp_found -ne 1 ]; then
- dgc_major=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
- dgc_middle=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
- dgc_minor=$(g++ --version | grep g++ | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
+ dgc_major=$(g++ --version | grep g++ | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g')
+ dgc_middle=$(g++ --version | grep g++ | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g')
+ dgc_minor=$(g++ --version | grep g++ | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g')
if [ $dgc_major -gt 4 ]; then
echo -e "g++ $dgc_major.$dgc_middle.$dgc_minor \033[92;1m SUCCESS \033[0m"
--
GitLab