00db10
NOTE: This is a downstream patch that should not go upstream.
00db10
00db10
diff -Nrup a/nss/Makefile b/nss/Makefile
00db10
--- a/nss/Makefile	2019-07-30 13:28:36.493476963 -0400
00db10
+++ b/nss/Makefile	2019-07-30 13:33:14.536086456 -0400
00db10
@@ -118,7 +118,14 @@ $(inst_vardbdir)/Makefile: db-Makefile $
00db10
 libnss_test1.so-no-z-defs = 1
00db10
 libnss_test2.so-no-z-defs = 1
00db10
 
00db10
-rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver
00db10
+# RHEL 7 glibc tree does not support rtld-tests-LDFLAGS.
00db10
+# Instead we directly alter the way the tests are built.
00db10
+# rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver
00db10
+LDFLAGS-tst-nss-test1 += -Wl,-E
00db10
+LDFLAGS-tst-nss-test2 += -Wl,-E
00db10
+LDFLAGS-tst-nss-test3 += -Wl,-E
00db10
+LDFLAGS-tst-nss-test4 += -Wl,-E
00db10
+LDFLAGS-tst-nss-test5 += -Wl,-E
00db10
 
00db10
 libof-nss_test1 = extramodules
00db10
 libof-nss_test2 = extramodules