mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 15:12:04 +00:00
buildman: Move setting of toolchain arguments to _build_args()
Move a few more pieces to this new function. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
7524700061
commit
a06ed7fbef
1 changed files with 5 additions and 4 deletions
|
@ -137,11 +137,12 @@ class BuilderThread(threading.Thread):
|
||||||
return self.builder.do_make(commit, brd, stage, cwd, *args,
|
return self.builder.do_make(commit, brd, stage, cwd, *args,
|
||||||
**kwargs)
|
**kwargs)
|
||||||
|
|
||||||
def _build_args(self, args):
|
def _build_args(self, args, brd):
|
||||||
"""Set up arguments to the args list based on the settings
|
"""Set up arguments to the args list based on the settings
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
args (list of str): List of string arguments to add things to
|
args (list of str): List of string arguments to add things to
|
||||||
|
brd (Board): Board to create arguments for
|
||||||
"""
|
"""
|
||||||
if self.builder.verbose_build:
|
if self.builder.verbose_build:
|
||||||
args.append('V=1')
|
args.append('V=1')
|
||||||
|
@ -158,6 +159,8 @@ class BuilderThread(threading.Thread):
|
||||||
args.append('NO_LTO=1')
|
args.append('NO_LTO=1')
|
||||||
if self.builder.reproducible_builds:
|
if self.builder.reproducible_builds:
|
||||||
args.append('SOURCE_DATE_EPOCH=0')
|
args.append('SOURCE_DATE_EPOCH=0')
|
||||||
|
args.extend(self.builder.toolchains.GetMakeArguments(brd))
|
||||||
|
args.extend(self.toolchain.MakeArgs())
|
||||||
|
|
||||||
def run_commit(self, commit_upto, brd, work_dir, do_config, config_only,
|
def run_commit(self, commit_upto, brd, work_dir, do_config, config_only,
|
||||||
force_build, force_build_failures, work_in_output,
|
force_build, force_build_failures, work_in_output,
|
||||||
|
@ -274,11 +277,9 @@ class BuilderThread(threading.Thread):
|
||||||
src_dir = os.getcwd()
|
src_dir = os.getcwd()
|
||||||
else:
|
else:
|
||||||
args.append(f'O={out_rel_dir}')
|
args.append(f'O={out_rel_dir}')
|
||||||
self._build_args(args)
|
self._build_args(args, brd)
|
||||||
config_args = [f'{brd.target}_defconfig']
|
config_args = [f'{brd.target}_defconfig']
|
||||||
config_out = ''
|
config_out = ''
|
||||||
args.extend(self.builder.toolchains.GetMakeArguments(brd))
|
|
||||||
args.extend(self.toolchain.MakeArgs())
|
|
||||||
|
|
||||||
# Remove any output targets. Since we use a build directory that
|
# Remove any output targets. Since we use a build directory that
|
||||||
# was previously used by another board, it may have produced an
|
# was previously used by another board, it may have produced an
|
||||||
|
|
Loading…
Reference in a new issue