Skip to content

Commit acb5010

Browse files
authored
[bsp/allwinner]update allwinnter libraries object file path (#7482)
1 parent 5991990 commit acb5010

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

bsp/allwinner/d1/SConstruct

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ d1_library = 'sunxi-hal'
4444
rtconfig.BSP_LIBRARY_TYPE = d1_library
4545

4646
# include libraries
47-
objs.extend(SConscript(os.path.join(libraries_path_prefix, d1_library, 'SConscript')))
47+
objs.extend(SConscript(os.path.join(libraries_path_prefix, d1_library, 'SConscript'), variant_dir='build/libraries/sunxi-hal', duplicate=0))
4848

4949
# include drivers
50-
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
50+
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), variant_dir='build/libraries/drivers', duplicate=0))
5151

5252
# include libos
53-
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript')))
53+
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript'), variant_dir='build/libraries/libos', duplicate=0))
5454

5555
stack_size = 4096
5656

bsp/allwinner/d1s/SConstruct

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ hal_library = 'sunxi-hal'
7979
rtconfig.BSP_LIBRARY_TYPE = hal_library
8080

8181
# include libraries
82-
objs.extend(SConscript(os.path.join(libraries_path_prefix, hal_library, 'SConscript')))
82+
objs.extend(SConscript(os.path.join(libraries_path_prefix, hal_library, 'SConscript'), variant_dir='build/libraries/sunxi-hal', duplicate=0))
8383

8484
# include drivers
85-
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript')))
85+
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'drivers', 'SConscript'), variant_dir='build/libraries/drivers', duplicate=0))
8686

8787
# include libos
88-
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript')))
88+
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'libos', 'SConscript'), variant_dir='build/libraries/libos', duplicate=0))
8989

9090
if rtconfig.PLATFORM == 'gcc':
9191
env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS -Wl,--start-group $_LIBFLAGS -Wl,--end-group'

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ rtc_path = [cwd + '/../include/hal/rtc']
221221
twi_src = []
222222
twi_path = []
223223
if GetDepend('DRIVERS_TWI'):
224-
twi_src += [cwd + '/source/twi/hal_twi.c']
224+
twi_src += ['source/twi/hal_twi.c']
225225
twi_path += [cwd + '/source/twi']
226226

227227
udc_src = Split('''

0 commit comments

Comments
 (0)