aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-01-31 01:38:05 +0000
committerEric Andersen <andersen@codepoet.org>2001-01-31 01:38:05 +0000
commit93a8e2e64be13737b9662747d3d5bf4405ec61cc (patch)
treeb37c19986cb8171146f3ba9722a4bfbe132f6a14
parent306f4fe480fe578b78d2c83fa7d13bc2a75f7ea9 (diff)
downloadbusybox-93a8e2e64be13737b9662747d3d5bf4405ec61cc.tar.gz
Patch from Larry Doolittle to reduce the chance that fussing with VPATH will
break cross-compilation. -Erik
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4026d61c5..b0beb1dd2 100644
--- a/Makefile
+++ b/Makefile
@@ -153,10 +153,11 @@ else
VPATH = .:$(BB_SRC_DIR)
CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH)))
CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null))
- CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) $(CROSS_CFLAGS)
+ CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH)))
endif
OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o
+CFLAGS += $(CROSS_CFLAGS)
CFLAGS += -DBB_VER='"$(VERSION)"'
CFLAGS += -DBB_BT='"$(BUILDTIME)"'
ifdef BB_INIT_SCRIPT