From b3e4901d60f9f1f017aeb1ec209aab44f67ce8ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:46:11 +0200 Subject: [PATCH] package/busybox: invert dependency with binutils Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/binutils/binutils.mk | 5 ----- package/busybox/busybox.mk | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index cb6022f7fa..090065a3e4 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -72,11 +72,6 @@ ifeq ($(BR2_ARM_CPU_ARMV7M)$(BR2_OPTIMIZE_S),yy) BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O2" endif -# Install binutils after busybox to prefer full-blown utilities -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -BINUTILS_DEPENDENCIES += busybox -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) BINUTILS_DEPENDENCIES += zlib endif diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 748f05aca3..d920987d11 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_BINUTILS),binutils) \ $(if $(BR2_PACKAGE_COREUTILS),coreutils) \ $(if $(BR2_PACKAGE_CPIO),cpio) \ $(if $(BR2_PACKAGE_DCRON),dcron) \ -- 2.30.2