diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 41cf0f6de72..aa6a737002c 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -63,6 +63,11 @@ CFLAGS+= -ftls-model=initial-exec
 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
index 325a320d55e..46b547e8da8 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -8,6 +8,11 @@ PACKAGE=	clibs
 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