From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 17 May 2012 20:19:43 +0000 (+0000)
Subject: make: do a better job of sanitizing LD_LIBRARY_PATH (fixes #8069)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fe99e3c5b5c59a2a67f5dd495d88caa0e613bfac;p=openwrt%2Fstaging%2Fldir.git

make: do a better job of sanitizing LD_LIBRARY_PATH (fixes #8069)

SVN-Revision: 31780
---

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 721d14c486..f4a2ee0603 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -22,8 +22,8 @@ export RELEASE
 export REVISION
 export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
-export LD_LIBRARY_PATH:=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
-export DYLD_LIBRARY_PATH:=$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
+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 GIT_CONFIG_PARAMETERS='core.autocrlf=false'
 
 # prevent perforce from messing with the patch utility