summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-11-29 02:52:25 +0000
committerMike Frysinger <vapier@gentoo.org>2005-11-29 02:52:25 +0000
commit004ad11337833e344b0aa943f214db07a888ddc3 (patch)
treeac290612dd5bfe8ed2cc2e1113de388c44510ff7
parent969af897970b493f2615a233f7c83ca86a6d488f (diff)
downloadbusybox-w32-004ad11337833e344b0aa943f214db07a888ddc3.tar.gz
busybox-w32-004ad11337833e344b0aa943f214db07a888ddc3.tar.bz2
busybox-w32-004ad11337833e344b0aa943f214db07a888ddc3.zip
ShaneAnderson writes in Bug 565:
need to include .config file before setting CROSS otherwise TARGET_ARCH isnt set properly
-rw-r--r--Rules.mak10
1 files changed, 5 insertions, 5 deletions
diff --git a/Rules.mak b/Rules.mak
index 6c4472644..848ae9777 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -17,6 +17,11 @@
17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18# 18#
19 19
20# Pull in the user's busybox configuration
21ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
22-include $(top_builddir)/.config
23endif
24
20#-------------------------------------------------------- 25#--------------------------------------------------------
21PROG := busybox 26PROG := busybox
22MAJOR_VERSION :=1 27MAJOR_VERSION :=1
@@ -108,11 +113,6 @@ TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
108 ) 113 )
109endif 114endif
110 115
111# Pull in the user's busybox configuration
112ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
113-include $(top_builddir)/.config
114endif
115
116# A nifty macro to make testing gcc features easier 116# A nifty macro to make testing gcc features easier
117check_gcc=$(shell \ 117check_gcc=$(shell \
118 if [ "$(1)" != "" ]; then \ 118 if [ "$(1)" != "" ]; then \