fix: more cross compilation stuff

SpikeHD · Oct 22, 2024 · 64f5f05 · 64f5f05
1 parent 6ec068c
commit 64f5f05
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -123,6 +123,7 @@ jobs:
         run: |
           sudo apt-get install -y \
             libc6:armhf \
+            libc6-dev:armhf \
             libapparmor1:armhf \
             libwebkit2gtk-4.1-dev:armhf \
             libssl-dev:armhf \
@@ -134,6 +135,7 @@ jobs:
         run: |
           sudo apt-get install -y \
             libc6:arm64 \
+            libc6-dev:arm64 \
             libapparmor1:arm64 \
             libwebkit2gtk-4.1-dev:arm64 \
             libssl-dev:arm64 \
@@ -158,7 +160,6 @@ jobs:
         env:
           CC: arm-linux-gnueabihf-gcc
           CXX: arm-linux-gnueabihf-g++
-          PKG_CONFIG_SYSROOT_DIR: /usr/
           PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig
 
       - name: (Linux ARM64) Build Webkit extension
@@ -167,7 +168,6 @@ jobs:
         env:
           CC: aarch64-linux-gnu-gcc
           CXX: aarch64-linux-gnu-g++
-          PKG_CONFIG_SYSROOT_DIR: /usr/
           PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
 
       - name: Install dependencies

diff --git a/src-tauri/extension_webkit/toolchain-arm64.cmake b/src-tauri/extension_webkit/toolchain-arm64.cmake
@@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR aarch64)
 # Cross-compilation toolchain
 set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
 set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
-set(CMAKE_SYSROOT /usr/lib/aarch64-linux-gnu)
+# set(CMAKE_SYSROOT /usr/lib/aarch64-linux-gnu)
 
 # Library paths
 set(CMAKE_FIND_ROOT_PATH /usr/lib/aarch64-linux-gnu)

diff --git a/src-tauri/extension_webkit/toolchain-armv7.cmake b/src-tauri/extension_webkit/toolchain-armv7.cmake
@@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR arm)
 # Cross-compilation toolchain
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
-set(CMAKE_SYSROOT /usr/lib/arm-linux-gnueabihf)
+# set(CMAKE_SYSROOT /usr/lib/arm-linux-gnueabihf)
 
 # Library paths
 set(CMAKE_FIND_ROOT_PATH /usr/lib/arm-linux-gnueabihf)