1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-31 15:21:29 +00:00

Fix c compiler (CC env) (ref #1864)

Fixes 2942072594
This commit is contained in:
Simon Frei 2022-11-27 21:53:18 +01:00
parent 2942072594
commit 373558b2ec
No known key found for this signature in database
GPG key ID: 7C31D23ECB1006F3

View file

@ -18,25 +18,25 @@ BUILD_TARGETS = [
'arch': 'arm',
'goarch': 'arm',
'jni_dir': 'armeabi',
'cc': 'armv7a-linux-androideabi16-clang',
'cc': 'armv7a-linux-androideabi{}-clang',
},
{
'arch': 'arm64',
'goarch': 'arm64',
'jni_dir': 'arm64-v8a',
'cc': 'aarch64-linux-android21-clang',
'cc': 'aarch64-linux-android{}-clang',
},
{
'arch': 'x86',
'goarch': '386',
'jni_dir': 'x86',
'cc': 'i686-linux-android16-clang',
'cc': 'i686-linux-android{}-clang',
},
{
'arch': 'x86_64',
'goarch': 'amd64',
'jni_dir': 'x86_64',
'cc': 'x86_64-linux-android21-clang',
'cc': 'x86_64-linux-android{}-clang',
}
]
@ -97,7 +97,7 @@ for target in BUILD_TARGETS:
cc = '/'.join([
get_ndk_home(), "toolchains/llvm/prebuilt/", PLATFORM_DIRS[platform.system()], "bin",
target['cc']])
target['cc'].format(min_sdk)])
subprocess.check_call(
['go', 'run', 'build.go', '-goos', 'android',
'-goarch', target['goarch'], '-cc', cc,