From: Mike Frysinger Date: Tue, 29 Nov 2005 02:53:23 +0000 (-0000) Subject: ShaneAnderson writes in Bug 565: X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c5907cc380d9f022b459a3f300885406cec0eab8;p=oweals%2Fbusybox.git ShaneAnderson writes in Bug 565: need to include .config file before setting CROSS otherwise TARGET_ARCH isnt set properly --- diff --git a/busybox/Rules.mak b/busybox/Rules.mak index c46855aca..896e6bfed 100644 --- a/busybox/Rules.mak +++ b/busybox/Rules.mak @@ -17,6 +17,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# Pull in the user's busybox configuration +ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) +-include $(top_builddir)/.config +endif + #-------------------------------------------------------- PROG := busybox VERSION := 1.01 @@ -100,11 +105,6 @@ TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ ) endif -# Pull in the user's busybox configuration -ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) --include $(top_builddir)/.config -endif - # A nifty macro to make testing gcc features easier check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ then echo "$(1)"; else echo "$(2)"; fi)