Update the building workflow

Tencent · Oct 10, 2024 · 7c260f4 · 7c260f4
1 parent e6ecff9
commit 7c260f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -144,8 +144,11 @@ jobs:
           toolchain: stable
           target: 'aarch64-unknown-linux-ohos,armv7-unknown-linux-ohos,x86_64-unknown-linux-ohos'
 
-      - name: Run cargo build
-        run: cargo install ohrs && ohrs build -- --verbose --features ffi --release
+      - name: Install ohrs
+        run: cargo install ohrs
+
+      - name: Run ohrs build
+        run: ohrs build -- --verbose --features ffi --release
 
   static_analysis:
     name: Static analysis

diff --git a/src/build.rs b/src/build.rs
@@ -115,11 +115,7 @@ fn new_boringssl_cmake_config() -> cmake::Config {
                         for (name, value) in *params {
                             boringssl_cmake.define(name, value);
                         }
-                        // common arguments for ohos help us to ignore some error
-                        boringssl_cmake
-                            .define("CMAKE_C_FLAGS", "-Wno-unused-command-line-argument");
-                        boringssl_cmake
-                            .define("CMAKE_CXX_FLAGS", "-Wno-unused-command-line-argument");
+                        break;
                     }
                 }
 
@@ -129,6 +125,9 @@ fn new_boringssl_cmake_config() -> cmake::Config {
                 let toolchain_file = ohos_ndk_home.join("native/build/cmake/ohos.toolchain.cmake");
                 let toolchain_file = toolchain_file.to_str().unwrap();
                 boringssl_cmake.define("CMAKE_TOOLCHAIN_FILE", toolchain_file);
+                // common arguments for ohos help us to ignore some error
+                boringssl_cmake.define("CMAKE_C_FLAGS", "-Wno-unused-command-line-argument");
+                boringssl_cmake.define("CMAKE_CXX_FLAGS", "-Wno-unused-command-line-argument");
             }
         }