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 | fe99e3c5b5c59a2a67f5dd495d88caa0e613bfac (patch) | |
| tree | 8d6d1628eb8690e9b780bd582c6a273ac47a714c /include | |
| parent | 2360a53116558176f7164fd201d27b54f0f11215 (diff) | |
| download | upstream-fe99e3c5b5c59a2a67f5dd495d88caa0e613bfac.tar.gz upstream-fe99e3c5b5c59a2a67f5dd495d88caa0e613bfac.tar.bz2 upstream-fe99e3c5b5c59a2a67f5dd495d88caa0e613bfac.zip | |
make: do a better job of sanitizing LD_LIBRARY_PATH (fixes #8069)
SVN-Revision: 31780
Diffstat (limited to 'include')
| -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 |