- workaround for broken external toolchains

diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index 24181d6b0eaede39d84a7cc04488666acb728246..b1d117c08b254b345aa29456e29bd7bac6970637 100644 (file)
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -44,7 +44,7 @@ endif
 ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
 endif
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 57170f73130ae641b0b6bd5a0808e7a38c19e30d..9a5e22cf1b846d1f5dfb12bb3fe85def76ead327 100644 (file)
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -56,7 +56,7 @@ endif
 ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
 endif
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index fd0016df86c564e4b2ac48c74379f3212f3d0fa0..779ffd9bbfc863d83e39f901b7176fd0b6f464f3 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -98,7 +98,7 @@ endif
        @test -d $(TARGET_DIR)/usr/share && \
                rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
                true
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk
index 5476b23cb26101c88d7f580a864843ebc10b3742..28703d672e42d28b55463852a57fc4ed2f3883d9 100644 (file)
--- a/target/initramfs/initramfs.mk
+++ b/target/initramfs/initramfs.mk
@@ -22,7 +22,7 @@ endif
 ifneq ($(BR2_HAVE_INFOPAGES),y)
        rm -rf $(TARGET_DIR)/usr/info
 endif
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index bf54a5e4ae5798d8ce75712efde3a24d6ca83747..de93213b90f2639943d13826718c88481cda4f2c 100644 (file)
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -58,7 +58,7 @@ ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
 endif
        @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index bb23c0e691184e8e0767322c2cf5f5afbb440d16..a324460b2d051d5455e54a1a654a3bf59bbd3e06 100644 (file)
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -51,7 +51,7 @@ endif
 ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
 endif
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 7adb1455f3df8808885b29d9ce4698b13c8b2633..d471548fb3fc15629b40cf9a179d975bd4c5826e 100644 (file)
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -30,7 +30,7 @@ endif
 ifneq ($(BR2_HAVE_INFOPAGES),y)
        @rm -rf $(TARGET_DIR)/usr/info
 endif
-       $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
+       $(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
        # Use fakeroot to pretend all target binaries are owned by root
        rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        touch $(PROJECT_BUILD_DIR)/.fakeroot.00000