Browse Source

utils should be built all the time (iconv), disable building readelf

Peter S. Mazinger 18 years ago
parent
commit
3e458f0e82
2 changed files with 1 additions and 10 deletions
  1. 0 9
      Makefile
  2. 1 1
      utils/Makefile

+ 0 - 9
Makefile

@@ -276,21 +276,12 @@ ifeq ($(strip $(HAVE_SHARED)),y)
 endif
 
 .PHONY: utils
-ifeq ($(strip $(HAVE_SHARED)),y)
 utils:
 	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
-else
-utils: dummy
-endif
 
 # Installs helper applications, such as 'ldd' and 'ldconfig'
 install_utils: utils
 	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -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
 
 finished2:
 	$(SECHO)

+ 1 - 1
utils/Makefile

@@ -21,7 +21,7 @@ include $(TOPDIR)Rules.mak
 
 CFLAGS+=$(SSP_ALL_CFLAGS)
 
-TARGETS = ldd ldconfig readelf
+TARGETS = ldd ldconfig
 
 ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
 TARGET_ICONV = iconv