summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2003-12-04 06:36:52 +0000
committerManuel Novoa III <mjn3@codepoet.org>2003-12-04 06:36:52 +0000
commitde0c9a10efd21e3719dc33cb51ffb3d1615223c8 (patch)
treef74c697d03289faee975f59a6fc4c4072dbc5f9a /libc
parent0152631ea758c8756c8c350d3ad9f0f33fc9e211 (diff)
Building of iconv.o was accidently always disabled.
Also, build the iconv app in utils.
Diffstat (limited to 'libc')
-rw-r--r--libc/misc/wchar/Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile
index 58d7c6f16..a96dae2b4 100644
--- a/libc/misc/wchar/Makefile
+++ b/libc/misc/wchar/Makefile
@@ -29,9 +29,9 @@ MOBJ1= btowc.o wctob.o mbsinit.o mbrlen.o mbrtowc.o wcrtomb.o mbsrtowcs.o \
wcsrtombs.o _wchar_utf8sntowcs.o _wchar_wcsntoutf8s.o \
__mbsnrtowcs.o __wcsnrtombs.o wcwidth.o wcswidth.o
-#ifeq ($(UCLIBC_HAS_LOCALE),y)
-# MOBJ1 += iconv.o
-#endif
+ifeq ($(UCLIBC_HAS_LOCALE),y)
+ MOBJ1 += iconv.o
+endif
MSRC2= wstdio.c
MOBJ2= fwide.o \
@@ -60,10 +60,6 @@ $(MOBJ2): $(MSRC2)
$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
$(STRIPTOOL) -x -R .note -R .comment $*.o
-#iconv.target: wchar.c
-# $(TARGET_CC) $(CFLAGS) -DL_iconv_main wchar.c -o $@ $(LDADD_LIBFLOAT)
-# $(STRIPTOOL) -x -R .note -R .comment $@
-
clean:
- $(RM) *.[oa] *~ core #iconv.target
+ $(RM) *.[oa] *~ core