aboutsummaryrefslogtreecommitdiff
path: root/Rules.mak
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-11-29 02:52:25 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-11-29 02:52:25 +0000
commit34709f1a3176be07c882c6e7bc18d1e54ade11b5 (patch)
treeac290612dd5bfe8ed2cc2e1113de388c44510ff7 /Rules.mak
parent5a0ac7b22e20115c5227a59e2262aa7085688e33 (diff)
downloadbusybox-w32-34709f1a3176be07c882c6e7bc18d1e54ade11b5.tar.gz
busybox-w32-34709f1a3176be07c882c6e7bc18d1e54ade11b5.tar.bz2
busybox-w32-34709f1a3176be07c882c6e7bc18d1e54ade11b5.zip
ShaneAnderson writes in Bug 565:
need to include .config file before setting CROSS otherwise TARGET_ARCH isnt set properly git-svn-id: svn://busybox.net/trunk/busybox@12565 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'Rules.mak')
-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 \