From 036d64c035ba3293b2ac4b13531d16f01012a206 Mon Sep 17 00:00:00 2001
From: andy <1414772332@qq.com>
Date: Sat, 28 Jun 2025 13:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=BC=96=E8=AF=91=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=97=B6=E8=84=9A=E6=9C=AC=E6=97=A0=E6=B3=95=E9=80=80?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 make.py       | 7 +++++--
 make_riscv.py | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/make.py b/make.py
index c299387..bb8336c 100644
--- a/make.py
+++ b/make.py
@@ -144,11 +144,14 @@ def run_cmd_queue(cmd_queue:Queue,cpu_num:int=cpu_count()):
     process_list.append(p)
   for i in process_list:
     i.join()
+  # 消耗掉所有数据防止进程无法退出
+  while not cmd_queue.empty():
+    cmd_queue.get()
   while not return_list.empty():
     i=return_list.get()
     if(not i[1]):
       print(f"子进程 [{i[0]}] 运行失败")
-      exit(-1)
+      sys.exit(-1)
 
 
 # 保证目标都存在
@@ -207,7 +210,7 @@ def build_target(src:list):
     print(f"链接 {dst}")
     ret=os.system(cmd)
     if(ret):
-      exit()
+      sys.exit(-1)
 
 
 def main():
diff --git a/make_riscv.py b/make_riscv.py
index 1f61170..1c4bf3a 100644
--- a/make_riscv.py
+++ b/make_riscv.py
@@ -159,11 +159,14 @@ def run_cmd_queue(cmd_queue:Queue,cpu_num:int=cpu_count()):
     process_list.append(p)
   for i in process_list:
     i.join()
+  # 消耗掉所有数据防止进程无法退出
+  while not cmd_queue.empty():
+    cmd_queue.get()
   while not return_list.empty():
     i=return_list.get()
     if(not i[1]):
       print(f"子进程 [{i[0]}] 运行失败")
-      exit(-1)
+      sys.exit(-1)
 
 
 # 保证目标都存在
@@ -226,7 +229,7 @@ def build_target(src:list):
     print(f"链接 {dst}")
     ret=os.system(cmd)
     if(ret):
-      exit()
+      sys.exit()