Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2024-12-16 06:00:33 +01:00
Code Issues Projects Releases Wiki Activity

waifulib: xcompile: allow building with host Clang and NDK r10e sysroot

Browse Source
This commit is contained in:
Alibek Omarov 2019-10-04 22:21:00 +03:00
parent 409eee3bb4
commit 2d6b770e7c
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/waifulib/xcompile.py
View File

@ -63,9 +63,6 @@ class Android:
if self.ndk_rev not in [10, 19, 20]: if self.ndk_rev not in [10, 19, 20]:
ctx.fatal('Unknown NDK revision: %d' % (self.ndk_rev)) ctx.fatal('Unknown NDK revision: %d' % (self.ndk_rev))
if self.is_host() and self.ndk_rev < 20:
ctx.fatal('Using host toolchain with this NDK revision is untested. You can comment this check, but you\'re on your own!')
if self.ndk_rev >= 19 or 'clang' in self.toolchain: if self.ndk_rev >= 19 or 'clang' in self.toolchain:
self.clang = True self.clang = True
@ -220,15 +217,26 @@ class Android:
def cflags(self, cxx = False): def cflags(self, cxx = False):
cflags = [] cflags = []
if self.is_host():
if self.ndk_rev >= 19: if self.ndk_rev < 20:
cflags += ['--sysroot=%s' % (self.sysroot())]
if self.is_host():
# Clang builtin redefine w/ different calling convention bug
# NOTE: I did not added complex.h functions here, despite
# that NDK devs forgot to put __NDK_FPABI_MATH__ for complex
# math functions
# I personally don't need complex numbers support, but if you want it
# just run sed to patch header
funcs = [ 'strtod', 'strtof', 'strtold' ]
for f in funcs:
cflags += ['-fno-builtin-%s' % f]
else:
if self.is_host():
cflags += [ cflags += [
'--sysroot=%s/sysroot' % (self.gen_gcc_toolchain_path()), '--sysroot=%s/sysroot' % (self.gen_gcc_toolchain_path()),
'-I%s/usr/include/' % (self.sysroot()) '-I%s/usr/include/' % (self.sysroot())
] ]
else: cflags += ['--sysroot=%s' % (self.sysroot())]
elif self.ndk_rev < 20:
cflags += ['--sysroot=%s' % (self.sysroot())]
cflags += ['-I%s' % (self.system_stl()), '-DANDROID', '-D__ANDROID__'] cflags += ['-I%s' % (self.system_stl()), '-DANDROID', '-D__ANDROID__']
if cxx and not self.is_clang() and self.toolchain not in ['4.8','4.9']: if cxx and not self.is_clang() and self.toolchain not in ['4.8','4.9']:
@ -242,7 +250,7 @@ class Android:
cflags += [ '-mvectorize-with-neon-quad' ] cflags += [ '-mvectorize-with-neon-quad' ]
if self.is_hardfloat: if self.is_hardfloat:
cflags += ['-D_NDK_MATH_NO_SOFTFP=1', '-mhard-float', '-mfloat-abi=hard', '-DLOAD_HARDFP', '-DSOFTFP_LINK'] cflags += ['-D_NDK_MATH_NO_SOFTFP=1', '-mfloat-abi=hard', '-DLOAD_HARDFP', '-DSOFTFP_LINK']
else: else:
cflags += ['-mfloat-abi=softfp'] cflags += ['-mfloat-abi=softfp']
else: else: