For now, disable the iconv utility

diff --git a/Makefile b/Makefile
index d49f905..8640294 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -280,11 +280,11 @@ endif
 
 install_utils: utils
        $(MAKE) -C utils install
-ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
-       @$(MAKE) -C libc/misc/wchar iconv.target
-       $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin;
-       $(INSTALL) -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(RUNTIME_PREFIX)/usr/bin/iconv
-endif
+#ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
+#      @$(MAKE) -C libc/misc/wchar iconv.target
+#      $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin;
+#      $(INSTALL) -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(RUNTIME_PREFIX)/usr/bin/iconv
+#endif
 
 finished2:
        @echo

diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile
index f44a9c3..58d7c6f 100644 (file)
--- a/libc/misc/wchar/Makefile
+++ b/libc/misc/wchar/Makefile
@@ -23,16 +23,15 @@
 
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
-TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
 
 MSRC1=  wchar.c
 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 \
@@ -61,10 +60,10 @@ $(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 $@
+#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 #iconv.target