ソースを参照

- workaround for broken external toolchains

Bernhard Reutner-Fischer 18 年 前
コミット
3649fd504d

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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