mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-02-26 09:43:57 -04:00
waf: ardupilotwaf: remove common_features()
The function ap_program() was the only one that was using it, so let's just inline it. Besides, the name was misleading, since the (only) feature added was for programs instead of general task generators.
This commit is contained in:
parent
9c5593ef09
commit
12946db4dc
@ -101,7 +101,10 @@ def ap_program(bld, program_group='bin',
|
||||
if use_legacy_defines:
|
||||
kw['defines'].extend(_get_legacy_defines(bld.path.name))
|
||||
|
||||
kw['features'] = common_features(bld) + kw.get('features', [])
|
||||
kw['features'] = kw.get('features', [])
|
||||
|
||||
if bld.env.STATIC_LINKING:
|
||||
kw['features'].append('static_linking')
|
||||
|
||||
name = os.path.join(program_group, program_name)
|
||||
|
||||
@ -128,12 +131,6 @@ def _get_next_idx():
|
||||
LAST_IDX += 1
|
||||
return LAST_IDX
|
||||
|
||||
def common_features(bld):
|
||||
features = []
|
||||
if bld.env.STATIC_LINKING:
|
||||
features.append('static_linking')
|
||||
return features
|
||||
|
||||
@conf
|
||||
def ap_stlib(bld, **kw):
|
||||
if 'name' not in kw:
|
||||
|
Loading…
Reference in New Issue
Block a user