From f76d40a963c763a9b4dd856d3096e7b3d11dd67c Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 24 Jun 2021 21:28:01 +0000 Subject: [PATCH] ITS#9591 - Fix library symbol versioning map file for Solaris Solaris wants a different option to work with Gnu style library symbol maps --- configure.ac | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6e44acf395..000982843a 100644 --- a/configure.ac +++ b/configure.ac @@ -3131,13 +3131,18 @@ fi OL_VERSIONED_SYMBOLS="" if test $ol_enable_versioning != no; then - LDVS=`$LD --help < /dev/null 2>/dev/null | grep version-script` + LDVS=`$LD --help < /dev/null 2>/dev/null | grep gnu-version-script` if test -z "$LDVS"; then - if test $ol_enable_versioning = "yes" ; then - AC_MSG_ERROR([Library symbol versioning requested but not supported]) + LDVS=`$LD --help < /dev/null 2>/dev/null | version-script` + if test -z "$LDVS"; then + if test $ol_enable_versioning = "yes" ; then + AC_MSG_ERROR([Library symbol versioning requested but not supported]) + fi + else + OL_VERSIONED_SYMBOLS="-Wl,--version-script=" fi else - OL_VERSIONED_SYMBOLS="-Wl,--version-script=" + OL_VERSIONED_SYMBOLS="-z gnu-version-script=" fi fi