diff --git a/Makefile.in b/Makefile.in
index 4d20b026dff..0bf9b7e7707 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,10 +55,6 @@ export CFG_ENABLE_DEBUG
 export CFG_ENABLE_DEBUG_SKIA
 export RUSTC=$(CFG_RUSTC)
 export RUSTFLAGS=$(CFG_RUSTC_FLAGS)
-export CC=$(CFG_CC)
-export CXX=$(CFG_CXX)
-export LD=$(CFG_LD)
-export AR=$(CFG_AR)
 export RANLIB=$(CFG_RANLIB)
 export PYTHON=$(CFG_PYTHON2)
 export PATH=$(CFG_PATH)
@@ -95,7 +91,7 @@ $(S)config.stamp : $(S)configure $(S)Makefile.in
 ifneq ($(CFG_LOCAL_RUSTC),1)
 $(CFG_RUSTC): $(B)src/compiler/rust/rust-auto-clean-stamp
 	@$(call E, building rustc)
-	$(Q)CFG_RUSTC_FLAGS= CFG_ENABLE_DEBUG= RUSTFLAGS= $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust" CC=gcc CXX=g++ LD=ld AR=ar
+	$(Q)CFG_RUSTC_FLAGS= CFG_ENABLE_DEBUG= RUSTFLAGS= $(MAKE) -C "$(CFG_BUILD_DIR)src/compiler/rust"
 
 clean-rust:
 	@$(call E, cleaning rustc)
@@ -180,6 +176,11 @@ endif
 
 $(eval $(call DEF_SUBMODULE_DEPS,$(1)))
 
+CROSS_COMPILER_CC = CC=$(CFG_CC)
+CROSS_COMPILER_CXX = CXX=$(CFG_CXX)
+CROSS_COMPILER_LD = LD=$(CFG_LD)
+CROSS_COMPILER_AR = AR=$(CFG_AR)
+
 $$(DONE_$(1)) : $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1)) $$(RUSTC_DEP_$(1))
 #	@$$(call E, make: $(1))
 #	@$$(call E, $(1) deps= $$(DEPS_$(1)))
@@ -191,6 +192,10 @@ $$(DONE_$(1)) : $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1)) $$(RUSTC_DEP_$(1))
 	$$(ENV_CFLAGS_$(1)) \
 	$$(ENV_CXXFLAGS_$(1)) \
 	$$(ENV_RFLAGS_$(1)) \
+    $$(CROSS_COMPILER_CC) \
+    $$(CROSS_COMPILER_CXX) \
+    $$(CROSS_COMPILER_LD) \
+    $$(CROSS_COMPILER_AR) \
 	$$(MAKE) -C $$(B)src/$$(PATH_$(1)) && touch $$(DONE_$(1))
 
 # main submodule target
diff --git a/configure b/configure
index b6fc8368288..c0f2187f364 100755
--- a/configure
+++ b/configure
@@ -374,7 +374,7 @@ probe_need CFG_AUTOCONF213 autoconf213  \
 step_msg "looking for build programs"
 case ${TARGET_OSTYPE} in
     android)
-        CFG_PATH="${CFG_ANDROID_CROSS_PATH}/bin":$PATH
+        CFG_PATH=$PATH:"${CFG_ANDROID_CROSS_PATH}/bin"
         OLD_PATH=$PATH
         export PATH=${CFG_PATH}
 
@@ -536,6 +536,7 @@ if [ $CFG_OSTYPE = "linux-androideabi" ]
 then
 CFG_SUBMODULES="\
     support/glut/rust-glut \
+    support/egl/rust-egl \
     platform/android/libexpat \
     platform/android/libfreetype2 \
     platform/android/fontconfig \