From 728cc0d10b1be29e561b08a61eff8697307fc7f9 Mon Sep 17 00:00:00 2001 From: goomadao Date: Fri, 12 Jun 2020 16:31:38 +0800 Subject: [PATCH] Fix build on macOS and Windows --- core/clash.gradle.kts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/clash.gradle.kts b/core/clash.gradle.kts index 34a9347..e90573c 100644 --- a/core/clash.gradle.kts +++ b/core/clash.gradle.kts @@ -37,39 +37,39 @@ fun generateGolangBuildEnvironment(abi: String): Map { val cCompiler = when(abi) { "armeabi-v7a" -> - "armv7a-$host-androideabi$gMinSdkVersion-clang" + "armv7a-linux-androideabi$gMinSdkVersion-clang" "arm64-v8a" -> - "aarch64-$host-android$gMinSdkVersion-clang" + "aarch64-linux-android$gMinSdkVersion-clang" "x86" -> - "i686-$host-android$gMinSdkVersion-clang" + "i686-linux-android$gMinSdkVersion-clang" "x86_64" -> - "x86_64-$host-android$gMinSdkVersion-clang" + "x86_64-linux-android$gMinSdkVersion-clang" else -> throw GradleScriptException("Unsupported abi $abi", FileNotFoundException("Unsupported abi $abi")) } val cppCompiler = when(abi) { "armeabi-v7a" -> - "armv7a-$host-androideabi$gMinSdkVersion-clang++" + "armv7a-linux-androideabi$gMinSdkVersion-clang++" "arm64-v8a" -> - "aarch64-$host-android$gMinSdkVersion-clang++" + "aarch64-linux-android$gMinSdkVersion-clang++" "x86" -> - "i686-$host-android$gMinSdkVersion-clang++" + "i686-linux-android$gMinSdkVersion-clang++" "x86_64" -> - "x86_64-$host-android$gMinSdkVersion-clang++" + "x86_64-linux-android$gMinSdkVersion-clang++" else -> throw GradleScriptException("Unsupported abi $abi", FileNotFoundException("Unsupported abi $abi")) } val linker = when(abi) { "armeabi-v7a" -> - "arm-$host-androideabi-ld" + "arm-linux-androideabi-ld" "arm64-v8a" -> - "aarch64-$host-android-ld" + "aarch64-linux-android-ld" "x86" -> - "i686-$host-android-ld" + "i686-linux-android-ld" "x86_64" -> - "x86_64-$host-android-ld" + "x86_64-linux-android-ld" else -> throw GradleScriptException("Unsupported abi $abi", FileNotFoundException("Unsupported abi $abi")) }