From f110d330d5493f383067b4e82ebbfb72f40457b2 Mon Sep 17 00:00:00 2001
From: LoGin <longjin@DragonOS.org>
Date: Mon, 25 Dec 2023 21:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbootstrap=E5=9C=A8=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85riscv=20gcc=E4=BE=9D=E8=B5=96=E6=97=B6=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98=20(#476)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/bootstrap.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh
index 6b2f40876..275819917 100644
--- a/tools/bootstrap.sh
+++ b/tools/bootstrap.sh
@@ -47,7 +47,10 @@ install_ubuntu_debian_pkg()
         lsb-release \
         llvm-dev libclang-dev clang gcc-multilib \
         gcc build-essential fdisk dosfstools dnsmasq bridge-utils iptables libssl-dev pkg-config \
-		sphinx gcc-riscv64-unknown-elf gcc-riscv64-linux-gnu gdb-multiarch
+		sphinx
+	# 必须分开安装，否则会出现错误
+	sudo "$1" install -y \
+		gcc-riscv64-unknown-elf gcc-riscv64-linux-gnu gdb-multiarch
 	
 	# 如果python3没有安装
 	if [ -z "$(which python3)" ]; then
@@ -60,7 +63,7 @@ install_ubuntu_debian_pkg()
         sudo apt install -y docker.io docker-compose
 		sudo usermod -aG docker $USER
 		sudo newgrp docker
-		sudo systemctl restart docker
+		# sudo systemctl restart docker
     elif [ -z ${dockerInstall} ]; then
 		echo "您传入--no-docker参数生效, 安装docker步骤被跳过."
 	elif [ -n "$(which docker)" ]; then