citrus: fix libc_rtld build with STATIC_LOCALES set.

Fix locales build for libc_rtld
Disabled locales for libc_rtld.

diff --git a/lib/libc/citrus/Makefile.inc b/lib/libc/citrus/Makefile.inc
index 8138238..175c732 100644 (file)
--- a/lib/libc/citrus/Makefile.inc
+++ b/lib/libc/citrus/Makefile.inc
@@ -22,7 +22,7 @@ SRCS+=  citrus_prop.c
 # shared libc (but never used). This is a bug.
 .if ${STATIC_LOCALES} != ""
 .PATH: ${.CURDIR}/../libc/citrus/modules
-CFLAGS+=-I${.CURDIR}/citrus
+CFLAGS+=-I${.CURDIR}/../libc/citrus
 CFLAGS+=-D_I18N_STATIC
 .for var in ${STATIC_LOCALES}
 SRCS+= citrus_${var:L}.c

diff --git a/lib/libc_rtld/Makefile b/lib/libc_rtld/Makefile
index 9922735..586ff51 100644 (file)
--- a/lib/libc_rtld/Makefile
+++ b/lib/libc_rtld/Makefile
@@ -4,6 +4,7 @@ LIB=    c_rtld
 INTERNALLIB=
 INSTALL_PIC_ARCHIVE=
 NOPROFILE=
+STATIC_LOCALES=
 CFLAGS+=-I${.CURDIR}/../libc/include
 CFLAGS+=-I${.CURDIR}/../libc/rpc
 CFLAGS+=-I${.CURDIR}/../../include -D__thread=