Browse Source

- busybox recently renamed CROSS to CROSS_COMPILE. Pass in both for now.

Bernhard Reutner-Fischer 19 năm trước cách đây
mục cha
commit
df1496abee
1 tập tin đã thay đổi với 5 bổ sung2 xóa
  1. 5 2
      package/busybox/busybox.mk

+ 5 - 2
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