From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 5 Feb 2020 05:25:08 +0000 (+0100)
Subject: On Solaris, link shared libraries with --shared rather than -G.
X-Git-Tag: nettle_3.6rc1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a896feb0ce00453ef9811bb1cb1f3f7f1678d810;p=thirdparty%2Fnettle.git

On Solaris, link shared libraries with --shared rather than -G.
---

diff --git a/ChangeLog b/ChangeLog
index bc70e5f1..8a7c851d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2020-02-05  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac: On Solaris, link shared libraries with --shared
+	rather than -G. For gcc, --shared is the proper way. For Solaris'
+	proprietary cc, according to docs, it accepts --shared as an alias
+	for -G since Oracle Solaris Studio 12.4, and it was made more gcc
+	compatible in later versions. Since 12.4 was released in 2014,
+	don't attempt to cater for older versions.
+
 2020-01-26  Niels Möller  <nisse@lysator.liu.se>
 
 	* ecc-internal.h (struct ecc_curve): Delete g, the curve
diff --git a/configure.ac b/configure.ac
index 09f719a0..ba3ab7c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,13 +655,13 @@ case "$host_os" in
     LIBNETTLE_FORLINK=libnettle.so
     LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
     LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
-    LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)'
+    LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -h $(LIBNETTLE_SONAME)'
     LIBNETTLE_LIBS=''
 
     LIBHOGWEED_FORLINK=libhogweed.so
     LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
     LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
-    LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -G -h $(LIBHOGWEED_SONAME)'
+    LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) --shared -h $(LIBHOGWEED_SONAME)'
     LIBHOGWEED_LIBS='libnettle.so $(LIBS)'
     ;;
   *)