1
0
Эх сурвалжийг харах

[bsp/allwinner]update allwinnter libraries object file path (#7482)

flyingcys 2 жил өмнө
parent
commit
acb5010e04

+ 3 - 3
bsp/allwinner/d1/SConstruct

@@ -44,13 +44,13 @@ d1_library = 'sunxi-hal'
 rtconfig.BSP_LIBRARY_TYPE = d1_library
 
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, d1_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, d1_library, 'SConscript'), variant_dir='build/libraries/sunxi-hal', duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), variant_dir='build/libraries/drivers', duplicate=0))
 
 # include libos
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript'), variant_dir='build/libraries/libos', duplicate=0))
 
 stack_size = 4096
 

+ 3 - 3
bsp/allwinner/d1s/SConstruct

@@ -79,13 +79,13 @@ hal_library = 'sunxi-hal'
 rtconfig.BSP_LIBRARY_TYPE = hal_library
 
 # include libraries
-objs.extend(SConscript(os.path.join(libraries_path_prefix, hal_library, 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, hal_library, 'SConscript'), variant_dir='build/libraries/sunxi-hal', duplicate=0))
 
 # include drivers
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), variant_dir='build/libraries/drivers', duplicate=0))
 
 # include libos
-objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript')))
+objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript'), variant_dir='build/libraries/libos', duplicate=0))
 
 if rtconfig.PLATFORM == 'gcc':
     env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS -Wl,--start-group $_LIBFLAGS -Wl,--end-group'

+ 1 - 1
bsp/allwinner/libraries/sunxi-hal/hal/SConscript

@@ -221,7 +221,7 @@ rtc_path = [cwd + '/../include/hal/rtc']
 twi_src = []
 twi_path = []
 if GetDepend('DRIVERS_TWI'):
-    twi_src += [cwd + '/source/twi/hal_twi.c']
+    twi_src += ['source/twi/hal_twi.c']
     twi_path += [cwd + '/source/twi']
 
 udc_src = Split('''