From 61714724117cd25afd935a3bab836b13e90b763c Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Fri, 14 Aug 2020 00:12:07 -0400 Subject: [PATCH] Change -Bsymbolic-functions to -Wl,-Bsymbolic-functions --- configure.ac | 12 ++++++++++++ src/odbc/Makefile.am | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 44d9f29..2526918 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,7 @@ if test "$with_iodbc"; then HAVE_ODBC=true ODBC_CFLAGS=$(iodbc-config --prefix="$with_iodbc" --cflags) ODBC_LIBS=$(iodbc-config --prefix="$with_iodbc" --libs) + ODBC_LDFLAGS="" CFLAGS="$CFLAGS -DIODBC" OLDLDFLAGS=$LDFLAGS @@ -128,6 +129,16 @@ if test "$with_unixodbc"; then AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString, [ODBC_LIBS="$ODBC_LIBS -lodbcinst"], AC_MSG_ERROR([Could not find SQLGetPrivateProfileString in -lodbcinst])) LDFLAGS=$OLDLDFLAGS + + OLDLDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions" + AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) + AC_TRY_LINK([], [return 0], + [AC_MSG_RESULT(yes) + ODBC_LDFLAGS="-Wl,-Bsymbolic-functions"], + [AC_MSG_RESULT(no) + ODBC_LDFLAGS=""]) + LDFLAGS=$OLDLDFLAGS fi if test "x$HAVE_ODBC" = "xtrue"; then @@ -139,6 +150,7 @@ if test "x$HAVE_ODBC" = "xtrue"; then AC_SUBST(ODBC_CFLAGS) AC_SUBST(ODBC_LIBS) + AC_SUBST(ODBC_LDFLAGS) OPTDIRS="$OPTDIRS odbc" fi diff --git a/src/odbc/Makefile.am b/src/odbc/Makefile.am index 78558ae..48d322c 100644 --- a/src/odbc/Makefile.am +++ b/src/odbc/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libmdbodbc.la AM_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS) libmdbodbc_la_SOURCES = odbc.c connectparams.c libmdbodbc_la_LIBADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(ODBC_LIBS) -libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)' -Bsymbolic-functions +libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)' $(ODBC_LDFLAGS) if FAKE_GLIB libmdbodbc_la_SOURCES += ../libmdb/fakeglib.c endif