summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalte Starostik <m-starostik@versanet.de>2010-07-18 20:16:49 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-07-18 20:46:06 (GMT)
commited0d45fdd4b140484d6488deabca69a9088a43ca (patch)
treeab9090921c67fe9aaab6ac72bc9e60adf47a03a5
parent0383d48a5e61db900171ae74d4d2dfe30c420d04 (diff)
downloadbuildroot-ed0d45fdd4b140484d6488deabca69a9088a43ca.tar.gz
buildroot-ed0d45fdd4b140484d6488deabca69a9088a43ca.tar.bz2
Choose host/target ldconfig based on availability
Decide whether to use the host or target ldconfig based on an availability check instead of internal/external toolchain selection. An external toolchain may very well provide an ldconfig while the host's one may fail. External toolchain generated by Gentoo crossdev: $ LC_ALL=C i686-pc-linux-uclibc-ldconfig -r output/target/; echo $? i686-pc-linux-uclibc-ldconfig: skipping /usr/lib: No such file or directory 0 vs. the host (x86_64-pc-linux-gnu) version: $ LC_ALL=C /sbin/ldconfig -r output/target/; echo $? /sbin/ldconfig: Can't open configuration file output/target/etc/ld.so.conf: No such file or directory /sbin/ldconfig: Can't open cache file /var/cache/ldconfig/aux-cache : No such file or directory 1 Signed-off-by: Malte Starostik <m-starostik@versanet.de> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 189806d..1962466 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -127,10 +127,10 @@ TARGET_RANLIB = $(TARGET_CROSS)ranlib
TARGET_OBJCOPY = $(TARGET_CROSS)objcopy
TARGET_OBJDUMP = $(TARGET_CROSS)objdump
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_LDCONFIG = $(TARGET_CROSS)ldconfig
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+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)