Fix CI so that wolfSSL builds with appropriate ASM for macOS chip

cisco · Apr 29, 2024 · 65363bc · 65363bc
1 parent 5ea41da
commit 65363bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
@@ -59,7 +59,12 @@ jobs:
         git clone https://github.com/wolfSSL/wolfssl
         cd wolfssl
         ./autogen.sh
-        ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        CPU=`sysctl -n machdep.cpu.brand_string`
+        if [[ "$CPU" =~ Intel ]]; then
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        else
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-armasm' '--enable-aesgcm-stream'
+        fi
         make
         sudo make install
         cd ..

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -86,7 +86,12 @@ jobs:
         git clone https://github.com/wolfSSL/wolfssl
         cd wolfssl
         ./autogen.sh
-        ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        CPU=`sysctl -n machdep.cpu.brand_string`
+        if [[ "$CPU" =~ Intel ]]; then
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
+        else
+          ./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-armasm' '--enable-aesgcm-stream'
+        fi
         make
         sudo make install
         cd ..