Avoid using -Wl,--no-undefined on the mac where it does not work
This commit is contained in:
parent
8fca053226
commit
b5c5734d06
@ -279,10 +279,11 @@ BUILT_SOURCES = query/wasaparse.cpp
|
|||||||
AM_YFLAGS = -d
|
AM_YFLAGS = -d
|
||||||
|
|
||||||
# We use -release: the lib is only shared
|
# We use -release: the lib is only shared
|
||||||
# between recoll programs from the same release.
|
# between recoll programs from the same release. So the lib is just named
|
||||||
# -version-info $(VERSION_INFO)
|
# after the recoll version (e.g librecoll-1.27.1.so)
|
||||||
librecoll_la_LDFLAGS = -release $(VERSION) \
|
# -version-info $(VERSION_INFO) would handle ABI compat issues, we don't
|
||||||
-Wl,--no-undefined -Wl,--warn-unresolved-symbols
|
# need it
|
||||||
|
librecoll_la_LDFLAGS = -release $(VERSION) -no-undefined @NO_UNDEF_LINK_FLAG@
|
||||||
|
|
||||||
librecoll_la_LIBADD = $(XSLT_LIBS) $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
|
librecoll_la_LIBADD = $(XSLT_LIBS) $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
|
||||||
|
|
||||||
|
|||||||
@ -27,6 +27,19 @@ if test "$rcl_link_ok" = "no" ; then
|
|||||||
fi
|
fi
|
||||||
AC_LANG_POP([C++])
|
AC_LANG_POP([C++])
|
||||||
|
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
# We want librecoll.so to have no undefined symbols because it makes our
|
||||||
|
# life easier when building the loadable modules for, e.g. Python Can't
|
||||||
|
# make sense of the libtool -no-undefined flag. It seems to do nothing on
|
||||||
|
# Linux. Otoh, -Wl,--no-undefined or -z,defs is not portable (e.g. does not
|
||||||
|
# work on the mac). So set this link flag as a system-dependant value here
|
||||||
|
case $host_os in
|
||||||
|
linux*)
|
||||||
|
NO_UNDEF_LINK_FLAG=-Wl,--no-undefined
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
AC_PROG_YACC
|
AC_PROG_YACC
|
||||||
|
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
@ -505,6 +518,7 @@ RECOLL_DATADIR=${m_datadir}/recoll
|
|||||||
RCLVERSION=$PACKAGE_VERSION
|
RCLVERSION=$PACKAGE_VERSION
|
||||||
RCLLIBVERSION=$RCLVERSION
|
RCLLIBVERSION=$RCLVERSION
|
||||||
|
|
||||||
|
AC_SUBST(NO_UNDEF_LINK_FLAG)
|
||||||
AC_SUBST(RECOLL_DATADIR)
|
AC_SUBST(RECOLL_DATADIR)
|
||||||
AC_SUBST(X_CFLAGS)
|
AC_SUBST(X_CFLAGS)
|
||||||
AC_SUBST(X_PRE_LIBS)
|
AC_SUBST(X_PRE_LIBS)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user