svn commit: trunk/busybox

[aldot at busybox.net]

Author: aldot
Date: 2006-06-10 07:58:33 -0700 (Sat, 10 Jun 2006)
New Revision: 15358

Log:
- don't check for toolchain-setting for make targets that don't need them
- we already depend on sed, so do away with tr. Avoids pulling in yet another
  dependency.


Modified:
   trunk/busybox/Makefile
   trunk/busybox/Rules.mak


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-06-10 14:32:56 UTC (rev 15357)
+++ trunk/busybox/Makefile	2006-06-10 14:58:33 UTC (rev 15358)
@@ -17,6 +17,8 @@
 	clean distclean help \
 	release tags
 
+nocheck_targets := clean distclean help release tags
+
 # the toplevel sourcedir
 ifndef top_srcdir
 top_srcdir=$(CURDIR)
@@ -56,7 +58,7 @@
 endif
 
 ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
-# pull in OS specific commands like cp, mkdir, etc. early
+# pull in settings early
 -include $(top_srcdir)/Rules.mak
 endif
 

Modified: trunk/busybox/Rules.mak
===================================================================
--- trunk/busybox/Rules.mak	2006-06-10 14:32:56 UTC (rev 15357)
+++ trunk/busybox/Rules.mak	2006-06-10 14:58:33 UTC (rev 15358)
@@ -56,6 +56,7 @@
 # especially from the command line, use this instead of CFLAGS directly.
 # For optimization overrides, it's better still to set OPTIMIZATION.
 CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
+# be gentle to vi coloring.. ")
 
 # To compile vs some other alternative libc, you may need to use/adjust
 # the following lines to meet your needs...
@@ -114,6 +115,10 @@
 		rm -f conftest.c conftest.o; \
 	fi)
 
+ifeq ($(filter-out $(nocheck_targets),$(MAKECMDGOALS)),)
+check_cc:=
+endif
+
 # A not very robust macro to check for available ld flags
 ifeq ($(strip $(V)),2)
 VERBOSE_CHECK_LD=echo LD=\"$(1)\" check_ld $(2) >&2;
@@ -125,6 +130,10 @@
 		echo "-Wl,$(2)" ; \
 	fi)
 
+ifeq ($(filter-out $(nocheck_targets),$(MAKECMDGOALS)),)
+check_ld:=
+endif
+
 # A not very robust macro to check for available strip flags
 ifeq ($(strip $(V)),2)
 VERBOSE_CHECK_STRIP=echo STRIPCMD=\"$(1)\" check_strip $(2) >&2;
@@ -139,6 +148,9 @@
 		rm -f conftest.c conftest.o > /dev/null 2>&1 ; \
 	fi)
 
+ifeq ($(filter-out $(nocheck_targets),$(MAKECMDGOALS)),)
+check_strip:=
+endif
 
 
 # Select the compiler needed to build binaries for your development system
@@ -410,7 +422,7 @@
 do_ar              = @$(disp_ar)        ; $(cmd_ar)
 do_elf2flt         = @$(disp_elf2flt)   ; $(cmd_elf2flt)
 
-uppercase = $(shell echo $1 | tr '[:lower:]' '[:upper:]')
+uppercase = $(shell echo $1 | $(SED) -e "y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/")
 %.a:
 	@if test -z "$($(call uppercase,$*)_DIR)" ; then \
 		echo "Invalid target $@" ; \