aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-10 14:58:33 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-06-10 14:58:33 +0000
commite5de38497a2eea4683923fa6bca716583cfcdd83 (patch)
treeac40719d4788b08c7392e2666786a4d6effb1669
parent62f9856f5468123605aab5ff3457febe21e8141c (diff)
downloadbusybox-e5de38497a2eea4683923fa6bca716583cfcdd83.tar.gz
- 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.
-rw-r--r--Makefile4
-rw-r--r--Rules.mak14
2 files changed, 16 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b31c7bf3c..27e51e35e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ noconfig_targets := menuconfig config oldconfig randconfig hosttools \
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 @@ else
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
diff --git a/Rules.mak b/Rules.mak
index 952a10752..000790e64 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -56,6 +56,7 @@ LC_ALL:= C
# 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 @@ check_cc=$(shell \
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 @@ check_ld=$(shell \
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 @@ check_strip=$(shell \
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_link.h = @$(disp_link.h) ; $(cmd_link.h)
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 $@" ; \