joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 18:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gio: remove NDK r19b Windows workaround vestiges

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-05-08 14:27:54 +02:00
parent 78421b9db9
commit af46b2bf29
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gio/gio.go
+12 -19
View File
@@ -496,35 +496,28 @@ type arch struct {
iosArch string iosArch string
jniArch string jniArch string
clang string clang string
// TODO: Remove when https://github.com/android-ndk/ndk/issues/920
// is solved and released.
r19bWindowsClangArgs string
} }
var allArchs = map[string]arch{ var allArchs = map[string]arch{
"arm": arch{ "arm": arch{
iosArch: "armv7", iosArch: "armv7",
jniArch: "armeabi-v7a", jniArch: "armeabi-v7a",
clang: "armv7a-linux-androideabi16-clang", clang: "armv7a-linux-androideabi16-clang",
r19bWindowsClangArgs: "--target=armv7a-linux-androideabi16 -fno-addrsig",
}, },
"arm64": arch{ "arm64": arch{
iosArch: "arm64", iosArch: "arm64",
jniArch: "arm64-v8a", jniArch: "arm64-v8a",
clang: "aarch64-linux-android21-clang", clang: "aarch64-linux-android21-clang",
r19bWindowsClangArgs: "--target=aarch64-linux-androideabi21 -fno-addrsig",
}, },
"386": arch{ "386": arch{
iosArch: "i386", iosArch: "i386",
jniArch: "x86", jniArch: "x86",
clang: "i686-linux-android16-clang", clang: "i686-linux-android16-clang",
r19bWindowsClangArgs: "--target=i686-linux-androideabi16 -fno-addrsig",
}, },
"amd64": arch{ "amd64": arch{
iosArch: "x86_64", iosArch: "x86_64",
jniArch: "x86_64", jniArch: "x86_64",
clang: "x86_64-linux-android21-clang", clang: "x86_64-linux-android21-clang",
r19bWindowsClangArgs: "--target=x86_64-linux-androideabi21 -fno-addrsig",
}, },
} }