diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-01-31 01:38:05 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-01-31 01:38:05 +0000 |
| commit | 93a8e2e64be13737b9662747d3d5bf4405ec61cc (patch) | |
| tree | b37c19986cb8171146f3ba9722a4bfbe132f6a14 /Makefile | |
| parent | 306f4fe480fe578b78d2c83fa7d13bc2a75f7ea9 (diff) | |
| download | busybox-w32-93a8e2e64be13737b9662747d3d5bf4405ec61cc.tar.gz busybox-w32-93a8e2e64be13737b9662747d3d5bf4405ec61cc.tar.bz2 busybox-w32-93a8e2e64be13737b9662747d3d5bf4405ec61cc.zip | |
Patch from Larry Doolittle to reduce the chance that fussing with VPATH will
break cross-compilation.
-Erik
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -153,10 +153,11 @@ else | |||
| 153 | VPATH = .:$(BB_SRC_DIR) | 153 | VPATH = .:$(BB_SRC_DIR) |
| 154 | CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH))) | 154 | CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH))) |
| 155 | CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null)) | 155 | CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null)) |
| 156 | CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) $(CROSS_CFLAGS) | 156 | CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) |
| 157 | endif | 157 | endif |
| 158 | 158 | ||
| 159 | OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o | 159 | OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o |
| 160 | CFLAGS += $(CROSS_CFLAGS) | ||
| 160 | CFLAGS += -DBB_VER='"$(VERSION)"' | 161 | CFLAGS += -DBB_VER='"$(VERSION)"' |
| 161 | CFLAGS += -DBB_BT='"$(BUILDTIME)"' | 162 | CFLAGS += -DBB_BT='"$(BUILDTIME)"' |
| 162 | ifdef BB_INIT_SCRIPT | 163 | ifdef BB_INIT_SCRIPT |