From: jow Date: Fri, 17 Jul 2015 11:37:47 +0000 (+0000) Subject: CC: toplevel.mk: fix LD_LIBRARY_PATH for host binaries X-Git-Tag: 15.05~69 X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=12a75ad198a96ec39e98fa1fdd3740aa1316a255;p=15.05%2Fopenwrt.git 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 --- 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))