Browse Source

[libcpu] Fix the build directory issue

BernardXiong 6 years ago
parent
commit
bd8f0d0423

+ 1 - 1
libcpu/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 if rtconfig.ARCH in list:
 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')
 Return('group')

+ 2 - 2
libcpu/arc/SConscript

@@ -9,9 +9,9 @@ cwd   = GetCurrentDir()
 group = []
 group = []
 
 
 # add common code files
 # 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
 # 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')
 Return('group')

+ 3 - 5
libcpu/arm/SConscript

@@ -5,14 +5,12 @@ from building import *
 
 
 Import('rtconfig')
 Import('rtconfig')
 
 
-cwd   = GetCurrentDir()
-group = []
-list  = os.listdir(cwd)
+cwd = GetCurrentDir()
 
 
 # add common code files
 # add common code files
-group = group + SConscript(os.path.join(cwd, 'common', 'SConscript'))
+group = SConscript(os.path.join('common', 'SConscript'))
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 1 - 1
libcpu/avr32/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 1 - 1
libcpu/blackfin/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 2 - 2
libcpu/c-sky/SConscript

@@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # add common code files
 # 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
 # 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')
 Return('group')

+ 1 - 1
libcpu/m16c/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 2 - 2
libcpu/mips/SConscript

@@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # add common code files
 # 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
 # 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')
 Return('group')

+ 1 - 1
libcpu/nios/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 2 - 2
libcpu/ppc/SConscript

@@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # add common code files
 # 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
 # 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')
 Return('group')

+ 2 - 2
libcpu/risc-v/SConscript

@@ -10,9 +10,9 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # add common code files
 # 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
 # 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')
 Return('group')

+ 1 - 1
libcpu/sim/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 1 - 1
libcpu/ti-dsp/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 1 - 1
libcpu/unicore32/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 1 - 1
libcpu/v850/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')

+ 1 - 1
libcpu/xilinx/SConscript

@@ -10,6 +10,6 @@ group = []
 list  = os.listdir(cwd)
 list  = os.listdir(cwd)
 
 
 # cpu porting code files
 # 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')
 Return('group')