X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Ftoplevel.mk;h=4c76fb8b017d5894f4162bef5c8f1d834f0a0dc6;hb=8a25c3c9d37fb6c955bce811ffddd97c673af2aa;hp=721d14c4864bd7431e3e8787fa566345c808825a;hpb=c589be64704473b15e8fac577f3fdb928d194d91;p=openwrt.git

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 721d14c486..4c76fb8b01 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
@@ -32,7 +32,7 @@ unexport P4PORT P4USER P4CONFIG P4CLIENT
 # prevent user defaults for quilt from interfering
 unexport QUILT_PATCHES QUILT_PATCH_OPTS
 
-unexport C_INCLUDE_PATH
+unexport C_INCLUDE_PATH CROSS_COMPILE
 
 # prevent distro default LPATH from interfering
 unexport LPATH