CC: toplevel.mk: fix LD_LIBRARY_PATH for host binaries
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 17 Jul 2015 11:37:47 +0000 (11:37 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 17 Jul 2015 11:37:47 +0000 (11:37 +0000)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Backport of r46394

SVN-Revision: 46395

include/toplevel.mk

index bbeb7ebcefbf8e50178c2110b376b0300dd9ada9..11b2dd9e292588bcc91fdc2e4a962d44de7e9100 100644 (file)
@@ -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))