From aa1da43e21935f6e9572dcb8481eb795d49883ec Mon Sep 17 00:00:00 2001 From: yuoo655 <48611913+yuoo655@users.noreply.github.com> Date: Wed, 29 Jun 2022 13:58:22 +0000 Subject: [PATCH] remove zsh constraint --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ad371bf..335c87d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ -SHELL := /bin/zsh DOCKER_NAME ?= dinghao188/rcore-tutorial DIR := workplace .PHONY: docker build_docker @@ -184,9 +183,6 @@ ubuntu_setenv: # for github codespaces ubuntu with zsh SHELL := /bin/zsh codespaces_setenv: - curl https://sh.rustup.rs -sSf | sh -s -- -y - source /home/codespace/.cargo/env - rustc --version sudo apt install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev \ gawk build-essential bison flex texinfo gperf libtool patchutils bc \ zlib1g-dev libexpat-dev pkg-config libglib2.0-dev libpixman-1-dev git tmux python3 ninja-build -y @@ -195,5 +191,8 @@ codespaces_setenv: cd ../qemu-7.0.0 && ./configure --target-list=riscv64-softmmu,riscv64-linux-user cd ../qemu-7.0.0 && make -j$(nproc) cd ../qemu-7.0.0 && sudo make install + curl https://sh.rustup.rs -sSf | sh -s -- -y + /bin/zsh && source /home/codespace/.cargo/env + rustc --version qemu-system-riscv64 --version qemu-riscv64 --version \ No newline at end of file