Add the `dont_skip` attribute on dependency.
Instead of explicitly add the target associated to the toolchain if we use `build_nodeps` option let add an attribute base ourself on it to know if we need to add it or not. This way, we may have other dependency we must not skip.
This commit is contained in:
parent
c16a4f5111
commit
76aa746f84
|
@ -34,14 +34,10 @@ class Builder:
|
|||
|
||||
if option('build_nodeps'):
|
||||
# add all platform steps
|
||||
for pltName in PlatformInfo.all_running_platforms:
|
||||
plt = PlatformInfo.all_platforms[pltName]
|
||||
for tlcName in plt.toolchain_names:
|
||||
tlc = Dependency.all_deps[tlcName]
|
||||
src_plt_step = ('source', tlcName)
|
||||
add_target_step(src_plt_step, self._targets[src_plt_step])
|
||||
blt_plt_step = ('neutral' if tlc.neutral else pltName, tlcName)
|
||||
add_target_step(blt_plt_step, self._targets[blt_plt_step])
|
||||
for dep in steps:
|
||||
stepClass = Dependency.all_deps[dep[1]]
|
||||
if stepClass.dont_skip:
|
||||
add_target_step(dep, self._targets[dep])
|
||||
|
||||
src_targetDef = ('source', targetDef[1])
|
||||
add_target_step(src_targetDef, self._targets[src_targetDef])
|
||||
|
|
|
@ -6,6 +6,7 @@ from kiwixbuild.utils import Remotefile, add_execution_right, run_command
|
|||
pj = os.path.join
|
||||
|
||||
class android_ndk(Dependency):
|
||||
dont_skip = True
|
||||
neutral = False
|
||||
name = 'android-ndk'
|
||||
gccver = '4.9.x'
|
||||
|
|
|
@ -7,6 +7,7 @@ from kiwixbuild.utils import Remotefile, run_command
|
|||
pj = os.path.join
|
||||
|
||||
class android_sdk(Dependency):
|
||||
dont_skip = True
|
||||
neutral = True
|
||||
name = 'android-sdk'
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ from .base import Dependency, ReleaseDownload, NoopBuilder
|
|||
from kiwixbuild.utils import Remotefile
|
||||
|
||||
class armhf_toolchain(Dependency):
|
||||
dont_skip = True
|
||||
neutral = True
|
||||
name = 'armhf'
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ class Dependency(metaclass=_MetaDependency):
|
|||
all_deps = {}
|
||||
force_build = False
|
||||
force_native_build = False
|
||||
dont_skip = False
|
||||
|
||||
@classmethod
|
||||
def version(cls):
|
||||
|
|
Loading…
Reference in New Issue