summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/uclibc/uclibc.mk15
1 files changed, 11 insertions, 4 deletions
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index cbc2e56634..644c531b56 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -511,6 +511,16 @@ define UCLIBC_INSTALL_TARGET_CMDS
$(UCLIBC_INSTALL_TEST_SUITE)
endef
+# For FLAT binfmts (static) there are no host utils
+ifeq ($(BR2_BINFMT_FLAT),)
+define UCLIBC_INSTALL_UTILS_STAGING
+ $(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
+ ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
+ $(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
+ ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
+endef
+endif
+
define UCLIBC_INSTALL_STAGING_CMDS
$(MAKE1) -C $(@D) \
$(UCLIBC_MAKE_FLAGS) \
@@ -518,10 +528,7 @@ define UCLIBC_INSTALL_STAGING_CMDS
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=/ \
install_runtime install_dev
- install -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
- ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
- install -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
- ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
+ $(UCLIBC_INSTALL_UTILS_STAGING)
endef
uclibc-menuconfig: dirs uclibc-patch
OpenPOWER on IntegriCloud