Fix crossbuild to not forever expand the ENV vars.

Author: neurocis

assets/crossbuild

@@ -35,11 +35,15 @@ case "${CROSS_TRIPLE}" in
 	;;
 esac
 
+# store original PATH and LD_LIBRARY_PATH
+if [ -z ${PATH_ORIGIN+x} ]; then export PATH_ORIGIN=${PATH}; fi
+if [ -z ${LD_LIBRARY_PATH_ORIGIN+x} ]; then export LD_LIBRARY_PATH_ORIGIN=${LD_LIBRARY_PATH}; fi
+
 # configure environment
 if [ -n "${CROSS_TRIPLE}" ]; then
     export CROSS_ROOT="/usr/${CROSS_TRIPLE}"
-    export PATH="${CROSS_ROOT}/bin:${PATH}"
-    export LD_LIBRARY_PATH="/usr/x86_64-linux-gnu/${CROSS_TRIPLE}/lib:${LD_LIBRARY_PATH}"
+    export PATH="${CROSS_ROOT}/bin:${PATH_ORIGIN}"
+    export LD_LIBRARY_PATH="/usr/x86_64-linux-gnu/${CROSS_TRIPLE}/lib:${LD_LIBRARY_PATH_ORIGIN}"
 fi
 
 # try to exec direct binary instead on relying on the $PATH