Fix OHOS_ARCH mapping

aws · Jan 8, 2025 · 5a46a71 · 5a46a71
1 parent 7ec6073
commit 5a46a71
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/aws-lc-sys/builder/cmake_builder.rs b/aws-lc-sys/builder/cmake_builder.rs
@@ -44,6 +44,14 @@ fn find_cmake_command() -> Option<OsString> {
     }
 }
 
+fn map_to_ohos_arch(arch: &str) -> String {
+    match arch {
+        "aarch64" => "arm64-v8a".to_string(),
+        "arm" | "armv7" => "armeabi-v7a".to_string(),
+        _ => arch.to_string(),
+    }
+}
+
 impl CmakeBuilder {
     pub(crate) fn new(
         manifest_dir: PathBuf,
@@ -176,8 +184,8 @@ impl CmakeBuilder {
                 "CMAKE_TOOLCHAIN_FILE environment variable set: {toolchain}"
             ));
             if target_env() == "ohos" {
-            // The Open Harmony toolchain requires the following tweaks
-                cmake_cfg.define("OHOS_ARCH", target_arch());
+                // The Open Harmony toolchain requires the following tweaks
+                cmake_cfg.define("OHOS_ARCH", map_to_ohos_arch(&target_arch()));
                 cflags.push(" -Wno-unused-command-line-argument");
             }
             emit_warning(&format!("Setting CFLAGS: {cflags:?}"));