From eebe68233c88fd8bbd8f738d7a20576688b1db80 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Wed, 8 Apr 2020 14:10:03 -0600
Subject: [PATCH] Check for the Sun Studio C compiler on Solaris under /opt.
 Also intialize with_python to false.

---
 scripts/mkpkg | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/mkpkg b/scripts/mkpkg
index f54469880..9f57bae28 100755
--- a/scripts/mkpkg
+++ b/scripts/mkpkg
@@ -140,11 +140,16 @@ if [ "$crossbuild" = "false" ]; then
 	    ;;
 	sol[0-9]*)
 	    # Use the Sun Studio C compiler on Solaris if possible
-	    if [ -z "$CC" -a -x /usr/bin/cc ]; then
-		CC=/usr/bin/cc; export CC
-		if [ -z "$CFLAGS" ]; then
-		    CFLAGS=-O; export CFLAGS
-		fi
+	    if [ -z "$CC" ]; then
+		for f in /opt/developerstudio12.[9876]/bin/cc /opt/solarisstudio12.[43]/bin/cc; do
+		    if [ -x $f ]; then
+			CC=$f; export CC
+			if [ -z "$CFLAGS" ]; then
+			    CFLAGS=-O; export CFLAGS
+			fi
+			break
+		    fi
+		done
 	    fi
 	    ;;
     esac
@@ -157,6 +162,9 @@ configure_opts="${configure_opts}${configure_opts+$tab}--enable-package-build"
 # Some systems don't have a recent enough OpenSSL for the I/O log server.
 with_openssl=false
 
+# Not all systems have Python 3.
+with_python=false
+
 # Choose configure options by osversion.
 # We use the same configure options as vendor packages when possible.
 case "$osversion" in