aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--package/Makefile.in6
2 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index f6e02bc29d..a864aae65d 100644
--- a/Makefile
+++ b/Makefile
@@ -406,8 +406,12 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
rm -rf $(TARGET_DIR)/usr/share/gtk-doc
endif
find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
- $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
-
+ if [ -x "$(TARGET_CROSS)ldconfig" ]; \
+ then \
+ $(TARGET_CROSS)ldconfig -r $(TARGET_DIR) 2>/dev/null; \
+ else \
+ /sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null; \
+ fi
mkdir -p $(TARGET_DIR)/etc
echo $(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion) > \
$(TARGET_DIR)/etc/br-version
diff --git a/package/Makefile.in b/package/Makefile.in
index 1962466e2f..fc53a1b1e9 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -127,12 +127,6 @@ TARGET_RANLIB = $(TARGET_CROSS)ranlib
TARGET_OBJCOPY = $(TARGET_CROSS)objcopy
TARGET_OBJDUMP = $(TARGET_CROSS)objdump
-ifeq ($(shell $(SHELL) -c "command -v $(TARGET_CROSS)ldconfig"),)
-TARGET_LDCONFIG = /sbin/ldconfig
-else
-TARGET_LDCONFIG = $(TARGET_CROSS)ldconfig
-endif
-
ifeq ($(BR2_STRIP_strip),y)
STRIP_DISCARD_ALL:=--discard-all
STRIP_STRIP_UNNEEDED:=--strip-unneeded