From 751a531bff6186a7f2f218e63372b646d5c75781 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 17 Jul 2015 11:37:47 +0000 Subject: CC: toplevel.mk: fix LD_LIBRARY_PATH for host binaries Signed-off-by: Jo-Philipp Wich Backport of r46394 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46395 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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)) -- cgit v1.2.3