Merge pull request #2509 from BernardXiong/branch_tools

[libcpu] Fix the build directory issue
2019-03-26 23:44:19 +08:00 · 2019-03-26 23:44:19 +08:00 · 1cf98dd9a3
parent 0f22a85eba bd8f0d0423
commit 1cf98dd9a3
16 changed files with 23 additions and 25 deletions
--- a/libcpu/SConscript
+++ b/libcpu/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 if rtconfig.ARCH in list:
-    group = group + SConscript(os.path.join(cwd, rtconfig.ARCH, 'SConscript'))
+    group = group + SConscript(os.path.join(rtconfig.ARCH, 'SConscript'))

 Return('group')
--- a/libcpu/arc/SConscript
+++ b/libcpu/arc/SConscript
@ -9,9 +9,9 @@ cwd   = GetCurrentDir()
 group = []

 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = group + SConscript(os.path.join('common', 'SConscript'))

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/arm/SConscript
+++ b/libcpu/arm/SConscript
@ -5,14 +5,12 @@ from building import *

 Import('rtconfig')

-cwd   = GetCurrentDir()
-group = []
-list  = os.listdir(cwd)
+cwd = GetCurrentDir()

 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = SConscript(os.path.join('common', 'SConscript'))

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/avr32/SConscript
+++ b/libcpu/avr32/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/blackfin/SConscript
+++ b/libcpu/blackfin/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/c-sky/SConscript
+++ b/libcpu/c-sky/SConscript
@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)

 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = group + SConscript(os.path.join('common', 'SConscript'))

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/m16c/SConscript
+++ b/libcpu/m16c/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/mips/SConscript
+++ b/libcpu/mips/SConscript
@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)

 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = group + SConscript(os.path.join('common', 'SConscript'))

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/nios/SConscript
+++ b/libcpu/nios/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/ppc/SConscript
+++ b/libcpu/ppc/SConscript
@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)

 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = group + SConscript(os.path.join('common', 'SConscript'))

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/risc-v/SConscript
+++ b/libcpu/risc-v/SConscript
@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)

 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = group + SConscript(os.path.join('common', 'SConscript'))

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/sim/SConscript
+++ b/libcpu/sim/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/ti-dsp/SConscript
+++ b/libcpu/ti-dsp/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/unicore32/SConscript
+++ b/libcpu/unicore32/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/v850/SConscript
+++ b/libcpu/v850/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')
--- a/libcpu/xilinx/SConscript
+++ b/libcpu/xilinx/SConscript
@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)

 # cpu porting code files
-group = group + SConscript(os.path.join(cwd, rtconfig.CPU, 'SConscript'))
+group = group + SConscript(os.path.join(rtconfig.CPU, 'SConscript'))

 Return('group')