Patch to make the build work in both traditional and re-directed object mode.
Patch to make the build work in both traditional and re-directed object mode.

ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,nmav/nss,nmav/nss,ekr/nss-old,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss,ekr/nss-old,nmav/nss