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-w32-e5de38497a2eea4683923fa6bca716583cfcdd83.tar.gz
busybox-w32-e5de38497a2eea4683923fa6bca716583cfcdd83.tar.bz2
busybox-w32-e5de38497a2eea4683923fa6bca716583cfcdd83.zip
- 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 \
17 clean distclean help \ 17 clean distclean help \
18 release tags 18 release tags
19 19
20nocheck_targets := clean distclean help release tags
21
20# the toplevel sourcedir 22# the toplevel sourcedir
21ifndef top_srcdir 23ifndef top_srcdir
22top_srcdir=$(CURDIR) 24top_srcdir=$(CURDIR)
@@ -56,7 +58,7 @@ else
56endif 58endif
57 59
58ifneq ($(strip $(HAVE_DOT_CONFIG)),y) 60ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
59# pull in OS specific commands like cp, mkdir, etc. early 61# pull in settings early
60-include $(top_srcdir)/Rules.mak 62-include $(top_srcdir)/Rules.mak
61endif 63endif
62 64
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
56# especially from the command line, use this instead of CFLAGS directly. 56# especially from the command line, use this instead of CFLAGS directly.
57# For optimization overrides, it's better still to set OPTIMIZATION. 57# For optimization overrides, it's better still to set OPTIMIZATION.
58CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) 58CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
59# be gentle to vi coloring.. ")
59 60
60# To compile vs some other alternative libc, you may need to use/adjust 61# To compile vs some other alternative libc, you may need to use/adjust
61# the following lines to meet your needs... 62# the following lines to meet your needs...
@@ -114,6 +115,10 @@ check_cc=$(shell \
114 rm -f conftest.c conftest.o; \ 115 rm -f conftest.c conftest.o; \
115 fi) 116 fi)
116 117
118ifeq ($(filter-out $(nocheck_targets),$(MAKECMDGOALS)),)
119check_cc:=
120endif
121
117# A not very robust macro to check for available ld flags 122# A not very robust macro to check for available ld flags
118ifeq ($(strip $(V)),2) 123ifeq ($(strip $(V)),2)
119VERBOSE_CHECK_LD=echo LD=\"$(1)\" check_ld $(2) >&2; 124VERBOSE_CHECK_LD=echo LD=\"$(1)\" check_ld $(2) >&2;
@@ -125,6 +130,10 @@ check_ld=$(shell \
125 echo "-Wl,$(2)" ; \ 130 echo "-Wl,$(2)" ; \
126 fi) 131 fi)
127 132
133ifeq ($(filter-out $(nocheck_targets),$(MAKECMDGOALS)),)
134check_ld:=
135endif
136
128# A not very robust macro to check for available strip flags 137# A not very robust macro to check for available strip flags
129ifeq ($(strip $(V)),2) 138ifeq ($(strip $(V)),2)
130VERBOSE_CHECK_STRIP=echo STRIPCMD=\"$(1)\" check_strip $(2) >&2; 139VERBOSE_CHECK_STRIP=echo STRIPCMD=\"$(1)\" check_strip $(2) >&2;
@@ -139,6 +148,9 @@ check_strip=$(shell \
139 rm -f conftest.c conftest.o > /dev/null 2>&1 ; \ 148 rm -f conftest.c conftest.o > /dev/null 2>&1 ; \
140 fi) 149 fi)
141 150
151ifeq ($(filter-out $(nocheck_targets),$(MAKECMDGOALS)),)
152check_strip:=
153endif
142 154
143 155
144# Select the compiler needed to build binaries for your development system 156# Select the compiler needed to build binaries for your development system
@@ -410,7 +422,7 @@ do_link.h = @$(disp_link.h) ; $(cmd_link.h)
410do_ar = @$(disp_ar) ; $(cmd_ar) 422do_ar = @$(disp_ar) ; $(cmd_ar)
411do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt) 423do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt)
412 424
413uppercase = $(shell echo $1 | tr '[:lower:]' '[:upper:]') 425uppercase = $(shell echo $1 | $(SED) -e "y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/")
414%.a: 426%.a:
415 @if test -z "$($(call uppercase,$*)_DIR)" ; then \ 427 @if test -z "$($(call uppercase,$*)_DIR)" ; then \
416 echo "Invalid target $@" ; \ 428 echo "Invalid target $@" ; \