Build failure with --enable-static-nss in glibc 2.35

Build failure with --enable-static-nss in glibc 2.35

[Andrew Pinski]

Hi all, I get the following build failure if I use --enable-static-nss
while configuring:

nss_module.c: In function ‘module_load_nss_files’:
nss_module.c:153:7: error: ‘is_nscd’ undeclared (first use in this function)
  153 |   if (is_nscd)
      |       ^~~~~~~
nss_module.c:153:7: note: each undeclared identifier is reported only
once for each function it appears in
nss_module.c:155:51: error: ‘nscd_init_cb’ undeclared (first use in
this function); did you mean ‘nscd_init’?
  155 |       void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
      |                                                   ^~~~~~~~~~~~
      |                                                   nscd_init
nss_module.c: In function ‘module_load’:
nss_module.c:248:7: error: ‘is_nscd’ undeclared (first use in this function)
  248 |   if (is_nscd)
      |       ^~~~~~~
nss_module.c:266:55: error: ‘nscd_init_cb’ undeclared (first use in
this function); did you mean ‘nscd_init’?
  266 |           void (*cb) (size_t, struct traced_file *) = nscd_init_cb;
      |                                                       ^~~~~~~~~~~~
      |                                                       nscd_init


is_nscd is conditional included by:
#if defined USE_NSCD && (!defined DO_STATIC_NSS || defined SHARED)
/* Nonzero if this is the nscd process.  */
static bool is_nscd;

But is conditional used by something different:
#ifdef USE_NSCD
  if (is_nscd)

The source has not changed on the head of the git repo either.

Thanks,
Andrew