diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-05-17 20:19:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-05-17 20:19:43 +0000 |
| commit | 03a372b6fa99b6117a62434fafc5278696c5e117 (patch) | |
| tree | e4543359dbcb2784d66eabeb00d2cc78f5281e9d | |
| parent | 95757184a0b76adafb500cc62fd7ba6e3c8195de (diff) | |
| download | upstream-03a372b6fa99b6117a62434fafc5278696c5e117.tar.gz upstream-03a372b6fa99b6117a62434fafc5278696c5e117.tar.bz2 upstream-03a372b6fa99b6117a62434fafc5278696c5e117.zip | |
make: do a better job of sanitizing LD_LIBRARY_PATH (fixes #8069)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31780 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/toplevel.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 |