move env to workflow

tom8zds · Jan 7, 2024 · bf94444 · bf94444
1 parent 7c8fb39
commit bf94444
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -33,5 +33,8 @@ jobs:
         perl-version: '5.34'
     - name: PreBuild
       run: rustup target add aarch64-linux-android
+      env:
+        CC: $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang
+        AR: $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
     - name: Build
       run: cd rust && cargo b --target aarch64-linux-android --release
diff --git a/rust/.cargo/config.toml b/rust/.cargo/config.toml
@@ -1,6 +1,6 @@
 [env]
 OPENSSL_DIR  = { value = "../ssl/ssl_3", relative = true }
 AARCH64_LINUX_ANDROID_OPENSSL_LIB_DIR = { value = "./ssl/ssl_3/arm64-v8a", relative = true }
-CC = { value = "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang" }
-AR = { value = "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" }
+# CC = { value = "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang" }
+# AR = { value = "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" }
 RUST_BACKTRACE= { value = "1" }