D43910.id134713.diff
No OneTemporary
Actions

Size

857 B

Referenced Files

None

Subscribers

None

D43910.id134713.diff
View Options

	diff --git a/lib/libc/Makefile b/lib/libc/Makefile
	--- a/lib/libc/Makefile
	+++ b/lib/libc/Makefile
	@@ -63,6 +63,11 @@
	LDFLAGS+= -nodefaultlibs
	LIBADD+= compiler_rt
	LIBADD+= sys
	+.if defined(COMPAT_libcompat)
	+# XXX: work around gcc -m32 + bfd ld path issue for DT_NEEDED symbols.
	+# https://sourceware.org/bugzilla/show_bug.cgi?id=31395
	+LDFLAGS+= -Wl,--rpath=/usr/lib${COMPAT_libcompat}
	+.endif

	LDFLAGS+=-Wl,--auxiliary,libsys.so.7

	diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
	--- a/lib/libthr/Makefile
	+++ b/lib/libthr/Makefile
	@@ -8,6 +8,11 @@
	SHLIBDIR?= /lib

	LIBADD= c sys
	+.if defined(COMPAT_libcompat)
	+# XXX: work around gcc -m32 + bfd ld path issue for DT_NEEDED symbols.
	+# https://sourceware.org/bugzilla/show_bug.cgi?id=31395
	+LDFLAGS+= -Wl,--rpath=/usr/lib${COMPAT_libcompat}
	+.endif

	.include <src.opts.mk>
	MK_SSP= no