From df1496abee871f9cedaad3f41684b0e5344159b6 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 5 Jul 2006 11:23:17 +0000 Subject: - busybox recently renamed CROSS to CROSS_COMPILE. Pass in both for now. --- package/busybox/busybox.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 49631c1ef..595afd701 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -25,7 +25,7 @@ $(DL_DIR)/$(BUSYBOX_SOURCE): busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG_FILE) -$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) +$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUILD_DIR) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifeq ($(BR2_PACKAGE_SYSKLOGD),y) # if we have external syslogd, force busybox to use it @@ -49,7 +49,7 @@ endif touch $(BUSYBOX_DIR)/.configured $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \ + $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox @@ -64,6 +64,9 @@ endif busybox: uclibc $(TARGET_DIR)/bin/busybox +busybox-menuconfig: $(BUSYBOX_DIR)/.configured + $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig + busybox-clean: rm -f $(TARGET_DIR)/bin/busybox -$(MAKE) -C $(BUSYBOX_DIR) clean -- cgit v1.2.3