diff options
| -rw-r--r-- | mk/lib.mk | 2 | ||||
| -rw-r--r-- | mk/prog.mk | 11 |
2 files changed, 9 insertions, 4 deletions
@@ -25,6 +25,8 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS} ${SHLIB_NAME}: ${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP} +# We need to ensure we use libraries in /lib +LDFLAGS+= -L/${LIBNAME} -Wl,-rpath=/${LIBNAME} ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library $@ @@ -8,11 +8,14 @@ OBJS+= ${SRCS:.c=.o} include ${MK}/sys.mk # Some systems don't include /lib in their standard link path # so we should embed it if different -_RPATH_SH= if test "${SHLIBDIR}" != "/usr/${LIBNAME}"; then \ - echo "-Wl,-rpath=/${LIBNAME}"; \ +# This is currently hardcoded for NetBSD which has two dynamic linkers +# and we need to use the one in /libexec instead of /usr/libexec +_DYNLINK_SH= if test -e /libexec/ld.elf_so; then \ + echo "-Wl,-dynamic-linker=/libexec/ld.elf_so"; \ fi -_RPATH!= ${_RPATH_SH} -LDFLAGS+= ${_RPATH}$(shell ${_RPATH_SH}) +_DYNLINK!= ${_DYNLINK_SH} +LDFLAGS+= ${_DYNLINK}$(shell ${_DYNLINK_SH}) +LDFLAGS+= -Wl,-rpath=/${LIBNAME} -L/${LIBNAME} LDFLAGS+= ${PROGLDFLAGS} all: depend ${PROG} |