From d3820ed77e26759c3a3d29dad65bbcca371374c6 Mon Sep 17 00:00:00 2001
From: heyuanjie87 <943313837@qq.com>
Date: Fri, 22 Nov 2024 11:58:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99vector=E6=A8=A1=E5=9D=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libcpu/risc-v/SConscript             |  2 ++
 libcpu/risc-v/t-head/c908/SConscript |  3 ---
 libcpu/risc-v/vector/SConscript      | 12 ++++++++++++
 libcpu/risc-v/virt64/SConscript      |  3 ---
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 libcpu/risc-v/vector/SConscript

diff --git a/libcpu/risc-v/SConscript b/libcpu/risc-v/SConscript
index 273c997e8e..ca5934b4f3 100644
--- a/libcpu/risc-v/SConscript
+++ b/libcpu/risc-v/SConscript
@@ -16,6 +16,8 @@ if rtconfig.CPU in common64_arch :
 else :
     group += SConscript(os.path.join('common', 'SConscript'))
 
+group += SConscript(os.path.join('vector', 'SConscript'))
+
 # cpu porting code files
 if 'VENDOR' in vars(rtconfig) and rtconfig.VENDOR != '':
     group = group + SConscript(os.path.join(rtconfig.VENDOR, rtconfig.CPU, 'SConscript'))
diff --git a/libcpu/risc-v/t-head/c908/SConscript b/libcpu/risc-v/t-head/c908/SConscript
index 1f56051d1d..0e2b436623 100644
--- a/libcpu/risc-v/t-head/c908/SConscript
+++ b/libcpu/risc-v/t-head/c908/SConscript
@@ -5,9 +5,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 
-if GetDepend('ARCH_RISCV_VECTOR'):
-    CPPPATH += [cwd + '/../../vector/rvv-1.0']
-
 group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/libcpu/risc-v/vector/SConscript b/libcpu/risc-v/vector/SConscript
new file mode 100644
index 0000000000..69e8318e5c
--- /dev/null
+++ b/libcpu/risc-v/vector/SConscript
@@ -0,0 +1,12 @@
+# RT-Thread building script for component
+
+from building import *
+cwd     = GetCurrentDir()
+src     = []
+CPPPATH = []
+
+CPPPATH += [cwd + '/rvv-1.0']
+
+group = DefineGroup('libcpu', src, depend = ['ARCH_RISCV_VECTOR'], CPPPATH = CPPPATH)
+
+Return('group')
diff --git a/libcpu/risc-v/virt64/SConscript b/libcpu/risc-v/virt64/SConscript
index 632f947137..0e2b436623 100644
--- a/libcpu/risc-v/virt64/SConscript
+++ b/libcpu/risc-v/virt64/SConscript
@@ -5,9 +5,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c') + Glob('*.cpp') + Glob('*_gcc.S')
 CPPPATH = [cwd]
 
-if GetDepend('ARCH_RISCV_VECTOR'):
-    CPPPATH += [cwd + '/../vector/rvv-1.0']
-
 group = DefineGroup('libcpu', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')