smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert 82617f6b94

This commit is contained in:
Matthieu Gautier 2020-02-26 18:30:24 +01:00
parent ad24eaab4b
commit bf405d105c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kiwixbuild/platforms/android.py
View File

@ -42,6 +42,9 @@ class AndroidPlatformInfo(PlatformInfo):
def get_cross_config(self): def get_cross_config(self):
extra_libs = ['-llog'] extra_libs = ['-llog']
extra_cflags = ['-I{}'.format(pj(self.buildEnv.install_dir, 'include'))] extra_cflags = ['-I{}'.format(pj(self.buildEnv.install_dir, 'include'))]
if hasattr(self, 'march'):
extra_libs.append('-march={}'.format(self.march))
extra_cflags.append('-march={}'.format(self.march))
return { return {
'exe_wrapper_def': '', 'exe_wrapper_def': '',
'install_path': self.install_path, 'install_path': self.install_path,
@ -72,9 +75,10 @@ class AndroidPlatformInfo(PlatformInfo):
def set_comp_flags(self, env): def set_comp_flags(self, env):
super().set_comp_flags(env) super().set_comp_flags(env)
root_path = pj(self.install_path, 'sysroot') root_path = pj(self.install_path, 'sysroot')
env['CFLAGS'] = '-fPIC -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 --sysroot={} '.format(root_path) + env['CFLAGS'] march = '-march={}'.format(self.march) if hasattr(self,'march') else ''
env['CXXFLAGS'] = '-fPIC -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 --sysroot={} '.format(root_path) + env['CXXFLAGS'] env['CFLAGS'] = '-fPIC -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 --sysroot={} {} '.format(root_path, march) + env['CFLAGS']
env['LDFLAGS'] = '--sysroot={} '.format(root_path) + env['LDFLAGS'] env['CXXFLAGS'] = '-fPIC -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 --sysroot={} {} '.format(root_path, march) + env['CXXFLAGS']
env['LDFLAGS'] = '--sysroot={} {} '.format(root_path, march) + env['LDFLAGS']
def set_compiler(self, env): def set_compiler(self, env):
binaries = self.binaries() binaries = self.binaries()
@ -96,6 +100,7 @@ class AndroidArm(AndroidPlatformInfo):
arch = cpu = 'arm' arch = cpu = 'arm'
arch_full = 'arm-linux-androideabi' arch_full = 'arm-linux-androideabi'
abi = 'armeabi-v7a' abi = 'armeabi-v7a'
march = 'armv7-a'
class AndroidArm64(AndroidPlatformInfo): class AndroidArm64(AndroidPlatformInfo):