From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 17 Jul 2015 11:37:20 +0000 (+0000)
Subject: toplevel.mk: fix LD_LIBRARY_PATH for host binaries
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b052a00c0b5533f331ac5d10d402e8e5f22bab14;p=openwrt%2Fstaging%2Fnbd.git

toplevel.mk: fix LD_LIBRARY_PATH for host binaries

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

SVN-Revision: 46394
---

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))