fix

denoland · Feb 7, 2025 · f2ea70b · f2ea70b
1 parent 2943334
commit f2ea70b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
@@ -122,6 +122,12 @@ echo "sysroot env:"
 cat /sysroot/.env
 . /sysroot/.env
 
+if [ "$(uname -s)" = "Linux" ]; then
+  if [ "$(uname -m)" = "aarch64" ]; then
+    export PKG_CONFIG_LIBDIR=/sysroot/usr/lib/aarch64-linux-gnu/pkgconfig
+  fi
+fi
+
 # Important notes:
 #   1. -ldl seems to be required to avoid a failure in FFI tests. This flag seems
 #      to be in the Rust default flags in the smoketest, so uncertain why we need
@@ -155,11 +161,6 @@ RUSTDOCFLAGS<<__1
 __1
 CC=/usr/bin/clang-${llvmVersion}
 CFLAGS=$CFLAGS
-if [ "$(uname -s)" = "Linux" ]; then
-  if [ "$(uname -m)" = "aarch64" ]; then
-    export PKG_CONFIG_LIBDIR=/sysroot/usr/lib/aarch64-linux-gnu/pkgconfig
-  fi
-fi
 " > $GITHUB_ENV`,
 };
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -299,6 +299,12 @@ jobs:
           cat /sysroot/.env
           . /sysroot/.env
 
+          if [ "$(uname -s)" = "Linux" ]; then
+            if [ "$(uname -m)" = "aarch64" ]; then
+              export PKG_CONFIG_LIBDIR=/sysroot/usr/lib/aarch64-linux-gnu/pkgconfig
+            fi
+          fi
+
           # Important notes:
           #   1. -ldl seems to be required to avoid a failure in FFI tests. This flag seems
           #      to be in the Rust default flags in the smoketest, so uncertain why we need
@@ -332,11 +338,6 @@ jobs:
           __1
           CC=/usr/bin/clang-19
           CFLAGS=$CFLAGS
-          if [ "$(uname -s)" = "Linux" ]; then
-            if [ "$(uname -m)" = "aarch64" ]; then
-              export PKG_CONFIG_LIBDIR=/sysroot/usr/lib/aarch64-linux-gnu/pkgconfig
-            fi
-          fi
           " > $GITHUB_ENV
       - name: Remove macOS cURL --ipv4 flag
         run: |-