nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-03 16:51:32 +00:00
Code Releases Activity

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

Browse source 
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
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
syncthing/build-syncthing.py
View file

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