diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-17 20:19:43 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-17 20:19:43 +0000 |
| commit | 2a6d06d406146fd88555d4ea68fb94f28a4be612 (patch) | |
| tree | e4543359dbcb2784d66eabeb00d2cc78f5281e9d | |
| parent | 8cf054b884cd3d0a00a79053a16a6d99dd71aa91 (diff) | |
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 |