Fix so cross compiling works again...

This commit is contained in:
Eric Andersen 2000-12-12 23:23:32 +00:00
parent e3a48d865a
commit 4d4b3b1d88

View File

@ -67,12 +67,13 @@ STRIPTOOL = $(CROSS)strip
# To compile vs an alternative libc, you may need to use/adjust # To compile vs an alternative libc, you may need to use/adjust
# the following lines to meet your needs. This is how I make # the following lines to meet your needs. This is how I make
# busybox compile with uC-Libc... # busybox compile with uC-Libc (needs BB_GETOPT and BB_FEATURE_NFSMOUNT
#LIBCDIR=/home/andersen/CVS/uC-libc # disabled at the moment).
#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") #LIBCDIR=/home/andersen/CVS/uClibc
#CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
#LDFLAGS+=-nostdlib #LDFLAGS+=-nostdlib
#LIBRARIES = $(LIBCDIR)/libc.a -lgcc #LIBRARIES = $(LIBCDIR)/libc.a -lgcc
#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
#-------------------------------------------------------- #--------------------------------------------------------
@ -134,7 +135,7 @@ else
VPATH = .:$(BB_SRC_DIR) VPATH = .:$(BB_SRC_DIR)
CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH))) CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH)))
CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null)) CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null))
CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) $(CROSS_CFLAGS)
endif endif
OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o