* [PATCH] Use correct subdir when building tst-rfc3484* for mach and arm
@ 2023-10-31 9:50 Arjun Shankar
2023-10-31 16:35 ` Joseph Myers
0 siblings, 1 reply; 2+ messages in thread
From: Arjun Shankar @ 2023-10-31 9:50 UTC (permalink / raw)
To: Arjun Shankar, Joseph Myers, libc-alpha
Commit 7f602256ab5b85db1dbfb5f40bd109c4b37b68c8 moved the tst-rfc3484*
tests from posix/ to nss/, but didn't correct references to point to
their new subdir when building for mach and arm. This commit fixes
that.
Tested with build-many-glibcs.sh for i686-gnu.
---
sysdeps/mach/Makefile | 5 ++---
sysdeps/unix/sysv/linux/arm/Makefile | 3 ---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index a9d4aa04ce..5194e6ccea 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -60,12 +60,11 @@ else ifeq (nss,$(subdir))
LDLIBS-nss_files.so += $(objdir)/mach/libmachuser.so
LDLIBS-nss_db.so += $(objdir)/mach/libmachuser.so
LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so
-else ifeq (hesiod,$(subdir))
- LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so
-else ifeq (posix,$(subdir))
LDLIBS-tst-rfc3484 += $(objdir)/mach/libmachuser.so
LDLIBS-tst-rfc3484-2 += $(objdir)/mach/libmachuser.so
LDLIBS-tst-rfc3484-3 += $(objdir)/mach/libmachuser.so
+else ifeq (hesiod,$(subdir))
+ LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so
else ifeq (nscd,$(subdir))
LDLIBS-nscd += $(objdir)/mach/libmachuser.so
endif
diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile
index e2b5a0eab3..a73c897f43 100644
--- a/sysdeps/unix/sysv/linux/arm/Makefile
+++ b/sysdeps/unix/sysv/linux/arm/Makefile
@@ -38,9 +38,6 @@ endif
ifeq ($(subdir),nss)
libnss_db-sysdep_routines += libc-do-syscall
libnss_db-shared-only-routines += libc-do-syscall
-endif
-
-ifeq ($(subdir),posix)
LDFLAGS-tst-rfc3484 += $(common-objpfx)csu/libc-do-syscall.o
LDFLAGS-tst-rfc3484-2 += $(common-objpfx)csu/libc-do-syscall.o
LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o
--
2.41.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Use correct subdir when building tst-rfc3484* for mach and arm
2023-10-31 9:50 [PATCH] Use correct subdir when building tst-rfc3484* for mach and arm Arjun Shankar
@ 2023-10-31 16:35 ` Joseph Myers
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Myers @ 2023-10-31 16:35 UTC (permalink / raw)
To: Arjun Shankar; +Cc: libc-alpha
On Tue, 31 Oct 2023, Arjun Shankar wrote:
> Commit 7f602256ab5b85db1dbfb5f40bd109c4b37b68c8 moved the tst-rfc3484*
> tests from posix/ to nss/, but didn't correct references to point to
> their new subdir when building for mach and arm. This commit fixes
> that.
>
> Tested with build-many-glibcs.sh for i686-gnu.
OK.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-31 16:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-31 9:50 [PATCH] Use correct subdir when building tst-rfc3484* for mach and arm Arjun Shankar
2023-10-31 16:35 ` Joseph Myers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).