summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/busybox/busybox.mk17
1 files changed, 10 insertions, 7 deletions
diff --git a/packages/busybox/busybox.mk b/packages/busybox/busybox.mk
index 8b1934a..45d442f 100644
--- a/packages/busybox/busybox.mk
+++ b/packages/busybox/busybox.mk
@@ -31,19 +31,22 @@ BB_SRC_DIR := $(embtk_pkgb)/busybox-$(BB_VERSION)
BB_BUILD_DIR := $(embtk_pkgb)/busybox-$(BB_VERSION)
BB_NODESTDIR := y
-BB_MAKE_ENV := CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing"
-BB_MAKE_OPTS := CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(targetcc_cached)"
-BB_MAKE_OPTS += CONFIG_PREFIX="$(embtk_rootfs)"
+BB_MAKE_OPTS := CFLAGS="$(TARGET_CFLAGS) -pipe -fno-strict-aliasing"
+BB_MAKE_OPTS += CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(TARGETCC)"
+BB_MAKE_OPTS += CONFIG_PREFIX="$(embtk_rootfs)" CONFIG_EXTRA_LDFLAGS=""
define embtk_install_bb
- set -x; $(call embtk_makeinstall_pkg,bb)
+ $(call embtk_makeinstall_pkg,bb)
endef
define embtk_beforeinstall_bb
$(embtk_configure_bb)
- $(Q)$(MAKE) -C $(BB_BUILD_DIR) \
- CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(targetcc_cached)" \
- CONFIG_PREFIX="$(embtk_rootfs)" oldconfig
+ $(Q)$(MAKE) -C $(BB_BUILD_DIR) $(BB_MAKE_OPTS) oldconfig
+endef
+
+# This is needed as busybox is installed directly in the rootfs
+define embtk_postinstall_bb
+ $(Q)$(MAKE) -C $(BB_BUILD_DIR) $(BB_MAKE_OPTS) install
endef
define embtk_configure_bb