diff mbox series

Use correct subdir when building tst-rfc3484* for mach and arm

Message ID 20231031095048.1920117-1-arjun@redhat.com
State Committed
Commit 9db31d7456a68f7fc448b28dceced26db96f4d66
Headers
Series Use correct subdir when building tst-rfc3484* for mach and arm |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Arjun Shankar Oct. 31, 2023, 9:50 a.m. UTC 
  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(-)

Comments

Joseph Myers Oct. 31, 2023, 4:35 p.m. UTC | #1 
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.
diff mbox series

Patch

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