From eead0d294392b9930238cb372a047e7869144218 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Sat, 3 Apr 2021 11:15:13 +0100
Subject: [PATCH] Fix build on Solaris non-sparc.

Closes #2136. Thanks to chuckunix.
---
 ChangeLog.txt |  1 +
 config.mk     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 98fb4033..bf9b09fd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -28,6 +28,7 @@ Build:
 - A variety of minor build related fixes, like functions not having previous
   declarations.
 - Fix CMake cross compile builds not finding opensslconf.h. Closes #2160.
+- Fix build on Solaris non-sparc. Closes #2136.
 
 
 2.0.9 - 2021-03-11
diff --git a/config.mk b/config.mk
index d7b14b75..4392adf0 100644
--- a/config.mk
+++ b/config.mk
@@ -140,6 +140,7 @@ DB_HTML_XSL=man/html.xsl
 #MANCOUNTRIES=en_GB
 
 UNAME:=$(shell uname -s)
+ARCH:=$(shell uname -p)
 
 ifeq ($(UNAME),SunOS)
 	ifeq ($(CC),cc)
@@ -199,9 +200,15 @@ ifeq ($(WITH_SHARED_LIBRARIES),yes)
 endif
 
 ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		LIB_CFLAGS:=$(LIB_CFLAGS) -xc99 -KPIC
-	else
+	SEDINPLACE:=
+	ifeq ($(ARCH),sparc)
+		ifeq ($(CC),cc)
+			LIB_CFLAGS:=$(LIB_CFLAGS) -xc99 -KPIC
+		else
+			LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
+		endif
+	endif
+	ifeq ($(ARCH),i386)
 		LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
 	endif