diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-01-31 01:38:05 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-01-31 01:38:05 +0000 |
| commit | 54840f8d9fc53f063ce3a8c76c292a446069d7bc (patch) | |
| tree | b37c19986cb8171146f3ba9722a4bfbe132f6a14 /Makefile | |
| parent | 3155484c0fc2b38f046505a8f0358d3bad1f8b07 (diff) | |
| download | busybox-w32-54840f8d9fc53f063ce3a8c76c292a446069d7bc.tar.gz busybox-w32-54840f8d9fc53f063ce3a8c76c292a446069d7bc.tar.bz2 busybox-w32-54840f8d9fc53f063ce3a8c76c292a446069d7bc.zip | |
Patch from Larry Doolittle to reduce the chance that fussing with VPATH will
break cross-compilation.
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@1722 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'Makefile')
| -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 |