Simplify cross-compilation

Now we can make reference to build step in another target platform, we can
simplify cross-compilation fo libmagic and icu4c.
This commit is contained in:
Matthieu Gautier
2018-05-29 17:42:42 +02:00
parent a87ba06bf3
commit c8c0192675
6 changed files with 33 additions and 81 deletions

View File

@ -12,13 +12,9 @@ class AllBaseDependencies(Dependency):
class Builder(NoopBuilder):
@classmethod
def get_dependencies(cls, platformInfo):
base_deps = ['zlib', 'lzma', 'xapian-core', 'gumbo', 'pugixml', 'libmicrohttpd', 'libaria2']
if platformInfo.build != 'native':
base_deps += ["icu4c_cross-compile"]
if platformInfo.build != 'win32':
base_deps += ["libmagic_cross-compile"]
else:
base_deps += ["icu4c", "libmagic"]
base_deps = ['zlib', 'lzma', 'xapian-core', 'gumbo', 'pugixml', 'libmicrohttpd', 'libaria2', 'icu4c']
if platformInfo.build != 'win32':
base_deps += ["libmagic"]
if (platformInfo.build != 'android' and
neutralEnv('distname') != 'Darwin'):
base_deps += ['ctpp2c', 'ctpp2']