From 2ca71f90da82ff731175bf98917933cc4d4b0c60 Mon Sep 17 00:00:00 2001
From: Sherman <shaopengyu@rt-thread.com>
Date: Tue, 14 Dec 2021 18:25:56 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20MDK=20=E6=97=A7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=AF=86=E5=88=AB=20SConscript=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/ra6m4-cpk/SConscript     | 20 ++++++++++++++++----
 bsp/ra6m4-cpk/src/SConscript | 17 -----------------
 2 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 bsp/ra6m4-cpk/src/SConscript

diff --git a/bsp/ra6m4-cpk/SConscript b/bsp/ra6m4-cpk/SConscript
index fe0ae941ae..6c129cbc40 100644
--- a/bsp/ra6m4-cpk/SConscript
+++ b/bsp/ra6m4-cpk/SConscript
@@ -1,14 +1,26 @@
 # for module compiling
 import os
 Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
 
-cwd = str(Dir('#'))
-objs = []
+cwd = GetCurrentDir()
+src = []
+CPPPATH = []
 list = os.listdir(cwd)
 
+if rtconfig.CROSS_TOOL == 'iar':
+    print("\nThe current project does not support iar build\n")
+    Return('group')
+elif rtconfig.CROSS_TOOL == 'gcc':
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
+
+group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
+
 for d in list:
     path = os.path.join(cwd, d)
     if os.path.isfile(os.path.join(path, 'SConscript')):
-        objs = objs + SConscript(os.path.join(d, 'SConscript'))
+        group = group + SConscript(os.path.join(d, 'SConscript'))
 
-Return('objs')
+Return('group')
diff --git a/bsp/ra6m4-cpk/src/SConscript b/bsp/ra6m4-cpk/src/SConscript
deleted file mode 100644
index 3b82975eb6..0000000000
--- a/bsp/ra6m4-cpk/src/SConscript
+++ /dev/null
@@ -1,17 +0,0 @@
-Import('RTT_ROOT')
-Import('rtconfig')
-from building import *
-
-cwd = GetCurrentDir()
-src = []
-CPPPATH = []
-
-if rtconfig.CROSS_TOOL == 'iar':
-    print("\nThe current project does not support iar build\n")
-    Return('group')
-elif rtconfig.CROSS_TOOL == 'gcc':
-    CPPPATH = [cwd, ]
-    src = Glob('*.c')
-
-group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
-Return('group')