summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-11-08 08:06:38 +0000
committerEric Andersen <andersen@codepoet.org>2003-11-08 08:06:38 +0000
commit7d69caa207043d70b587dcb00f1d150c34cf7bcf (patch)
tree90b6c9af1d58dce16c4dd790fa390a420cb98615
parent2a01fa1548e5671880d6dd18c7d216ddf958ea96 (diff)
For now, disable the iconv utility
-rw-r--r--Makefile10
-rw-r--r--libc/misc/wchar/Makefile15
2 files changed, 12 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index d49f90549..86402947b 100644
--- 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 f44a9c3a5..58d7c6f16 100644
--- 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