From e92a8cbf71e14921d8ac118304059edb32df65eb Mon Sep 17 00:00:00 2001
From: xiaosuGW <xiaosuGW@localhost>
Date: Wed, 2 Jun 2021 15:28:32 -0500
Subject: [PATCH] add -u 0 for docker exec and set default toolchain for cargo

---
 Makefile  | 2 +-
 devenv.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3588bad..a7e5216 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ifeq ($(ARCH),x86_64)
 	cd ./awsm/wasmception && wget ${WASMCEPTION_URL} -O wasmception.tar.gz && tar xvfz wasmception.tar.gz && rm wasmception.tar.gz
 endif
 	test -f ./${COMPILER}/wasmception/dist/bin/clang || make -C ${COMPILER}/wasmception
-	@cd ${COMPILER} && cargo build --release && cd ${ROOT}
+	@cd ${COMPILER} && RUSTUP_TOOLCHAIN=stable cargo build --release && cd ${ROOT}
 
 # Sanity check that the aWsm compiler built and is in our PATH
 .PHONY: build-validate
diff --git a/devenv.sh b/devenv.sh
index f6ea1f5..254983c 100755
--- a/devenv.sh
+++ b/devenv.sh
@@ -103,7 +103,7 @@ envsetup() {
 
 	# Execute the make install command on the sledge-dev image to build the project
 	echo "Building ${SYS_NAME}"
-	docker exec \
+	docker exec -u 0 \
 		--tty \
 		--workdir "${HOST_SYS_MOUNT}" \
 		${SYS_DOC_DEVNAME} make install
@@ -144,7 +144,7 @@ envrun() {
 	fi
 
 	echo "Running shell"
-	docker exec --tty --interactive --workdir "${HOST_SYS_MOUNT}" ${SYS_DOC_NAME} /bin/bash
+	docker exec -u 0 --tty --interactive --workdir "${HOST_SYS_MOUNT}" ${SYS_DOC_NAME} /bin/bash
 }
 
 # Stops and removes the sledge "runtime" container