Changeset 66931 in vbox

Timestamp:

May 17, 2017 10:56:13 AM (8 years ago)

Author:

vboxsync

Message:

configure: improved gcc 7 check

File:

• trunk/configure (modified) (3 diffs)

trunk/configure

@@ -425 +425 @@
   test_header gcc
   if check_avail "$CC" CC really; then
-    cc_ver=`$CC -dumpversion` 2>/dev/null
+    cc_ver=`$CC -dumpfullversion` 2>/dev/null
+    if [ $? -ne 0 ]; then
+      cc_ver=`$CC -dumpversion` 2>/dev/null
+    fi
     if [ $? -ne 0 ]; then
       log_failure "cannot execute '$CC -dumpversion'"
@@ -431 +434 @@
     fi
     if check_avail "$CXX" CXX really; then
-      cxx_ver=`$CXX -dumpversion` 2>/dev/null
+      cxx_ver=`$CXX -dumpfullversion` 2>/dev/null
+      if [ $? -ne 0 ]; then
+        cxx_ver=`$CXX -dumpversion` 2>/dev/null
+      fi
       if [ $? -ne 0 ]; then
         log_failure "cannot execute '$CXX -dumpversion'"
@@ -448 +454 @@
              -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) \
              -o $cc_maj -gt 7 ]; then
-        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x, gcc 5.x or gcc 6.x"
+        log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x...7.x"
         fail really
       else