From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 17 Jul 2015 11:37:47 +0000 (+0000)
Subject: CC: toplevel.mk: fix LD_LIBRARY_PATH for host binaries
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=9b0d8204e190e2cdbb8cff2fc3ee68b7fbf6ccb8;p=openwrt%2Fsvn-archive%2Farchive.git

CC: toplevel.mk: fix LD_LIBRARY_PATH for host binaries

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

Backport of r46394

SVN-Revision: 46395
---

diff --git a/include/toplevel.mk b/include/toplevel.mk
index bbeb7ebcef..11b2dd9e29 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -24,8 +24,8 @@ OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
 export RELEASE
 export REVISION
 export OPENWRTVERSION
-export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
-export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
+export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(TOPDIR)/staging_dir/host/lib)
+export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(TOPDIR)/staging_dir/host/lib)
 export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
 export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS))