]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Solaris native compiler configure fixes
authorMark Andrews <marka@isc.org>
Wed, 30 Jun 2021 01:42:16 +0000 (11:42 +1000)
committerMark Andrews <marka@isc.org>
Wed, 30 Jun 2021 02:14:30 +0000 (12:14 +1000)
* Drop '-mt' from '$CC'
* Use '$CC -V' for version in summary

configure
configure.ac

index 0ebbef81ab38091cf3528189d5e754db2c8fcdfd..dee6484a662908235600b2a764088bca3933b15c 100755 (executable)
--- a/configure
+++ b/configure
@@ -17341,7 +17341,7 @@ then
                        CCNOOPT="$CCNOOPT -pthread"
                        ;;
                *-solaris*)
-                       CC="$CC -mt"
+                       CC="$CC"
                        CCOPT="$CCOPT -mt"
                        CCNOOPT="$CCNOOPT -mt"
                        ;;
@@ -29223,8 +29223,17 @@ report() {
     echo "    localstatedir: $localstatedir"
     echo "-------------------------------------------------------------------------------"
     echo "Compiler: $CC"
-    $CC --version 2>&1 | sed 's/^/    /'
-
+    if test "yes" == "$GCC"; then
+       $CC --version 2>&1 | sed 's/^/    /'
+    else
+       case "$host_os" in
+           solaris*)
+               $CC -V 2>&1 | sed 's/^/    /'
+               ;;
+           *)
+               $CC --version 2>&1 | sed 's/^/    /'
+       esac
+    fi
     if test "X$ac_unrecognized_opts" != "X"; then
        echo "Unrecognized options:"
        echo "    $ac_unrecognized_opts"
index f877ecc3d2e906773924fe82a244979845f231fe..05773db68f08250841a1d4194e35410cc069e67b 100644 (file)
@@ -1325,7 +1325,7 @@ then
                        CCNOOPT="$CCNOOPT -pthread"
                        ;;
                *-solaris*)
-                       CC="$CC -mt"
+                       CC="$CC"
                        CCOPT="$CCOPT -mt"
                        CCNOOPT="$CCNOOPT -mt"
                        ;;
@@ -5769,8 +5769,17 @@ report() {
     echo "    localstatedir: $localstatedir"
     echo "-------------------------------------------------------------------------------"
     echo "Compiler: $CC"
-    $CC --version 2>&1 | sed 's/^/    /'
-
+    if test "yes" == "$GCC"; then
+       $CC --version 2>&1 | sed 's/^/    /'
+    else
+       case "$host_os" in
+           solaris*)
+               $CC -V 2>&1 | sed 's/^/    /'
+               ;;
+           *)
+               $CC --version 2>&1 | sed 's/^/    /'
+       esac
+    fi
     if test "X$ac_unrecognized_opts" != "X"; then
        echo "Unrecognized options:"
        echo "    $ac_unrecognized_opts"