diff options
author | Eric Andersen <andersen@codepoet.org> | 2000-12-12 23:23:32 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2000-12-12 23:23:32 +0000 |
commit | 4d4b3b1d88296efab67e789a676feb61b7929412 (patch) | |
tree | 04d17e5d80a4204179ff087c9166afe609dbb9c7 | |
parent | e3a48d865a8f95aeedf27a31fe153ecabc2daefb (diff) | |
download | busybox-w32-4d4b3b1d88296efab67e789a676feb61b7929412.tar.gz busybox-w32-4d4b3b1d88296efab67e789a676feb61b7929412.tar.bz2 busybox-w32-4d4b3b1d88296efab67e789a676feb61b7929412.zip |
Fix so cross compiling works again...
-rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -67,12 +67,13 @@ STRIPTOOL = $(CROSS)strip | |||
67 | 67 | ||
68 | # To compile vs an alternative libc, you may need to use/adjust | 68 | # To compile vs an alternative libc, you may need to use/adjust |
69 | # the following lines to meet your needs. This is how I make | 69 | # the following lines to meet your needs. This is how I make |
70 | # busybox compile with uC-Libc... | 70 | # busybox compile with uC-Libc (needs BB_GETOPT and BB_FEATURE_NFSMOUNT |
71 | #LIBCDIR=/home/andersen/CVS/uC-libc | 71 | # disabled at the moment). |
72 | #GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") | 72 | #LIBCDIR=/home/andersen/CVS/uClibc |
73 | #CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR) | ||
74 | #LDFLAGS+=-nostdlib | 73 | #LDFLAGS+=-nostdlib |
75 | #LIBRARIES = $(LIBCDIR)/libc.a -lgcc | 74 | #LIBRARIES = $(LIBCDIR)/libc.a -lgcc |
75 | #CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR) | ||
76 | #GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") | ||
76 | 77 | ||
77 | #-------------------------------------------------------- | 78 | #-------------------------------------------------------- |
78 | 79 | ||
@@ -134,7 +135,7 @@ else | |||
134 | VPATH = .:$(BB_SRC_DIR) | 135 | VPATH = .:$(BB_SRC_DIR) |
135 | CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH))) | 136 | CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH))) |
136 | CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null)) | 137 | CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null)) |
137 | CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) | 138 | CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) $(CROSS_CFLAGS) |
138 | endif | 139 | endif |
139 | 140 | ||
140 | OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o | 141 | OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o |