Fix musl x86 libc++abi [skip skia]

Brooooooklyn · Jan 28, 2025 · 0816ba5 · 0816ba5
1 parent 41fafe7
commit 0816ba5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -125,9 +125,6 @@ jobs:
               set -e &&
               rustup target add aarch64-unknown-linux-musl &&
               unset RUSTFLAGS &&
-              export LIB_AOM_PKG_CONFIG_PATH=/usr/aarch64-alpine-linux-musl/aom/lib/pkgconfig/aom.pc &&
-              export LIB_AOM_INCLUDE_PATH=/usr/aarch64-alpine-linux-musl/aom/include &&
-              export LIB_AOM_STATIC_LIB_PATH=/usr/aarch64-alpine-linux-musl/aom/lib &&
               yarn build --target aarch64-unknown-linux-musl
           - host: ubuntu-latest
             target: 'armv7-unknown-linux-gnueabihf'

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -16,12 +16,6 @@ jobs:
       - name: Setup QEMU
         run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
-      - name: Download aom-dev
-        run: |
-          wget https://github.com/Brooooooklyn/canvas/releases/download/libaom-v3.5.0/aom-aarch64-linux-musl.tar
-          tar -xvf aom-aarch64-linux-musl.tar
-          rm aom-aarch64-linux-musl.tar
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

diff --git a/build.rs b/build.rs
@@ -107,7 +107,7 @@ fn main() {
 
   if compile_target_os != "windows" {
     build
-      .flag("-std=c++23")
+      .flag("-std=c++20")
       .flag("-fPIC")
       .flag("-fno-exceptions")
       .flag("-fno-rtti")

diff --git a/musl.Dockerfile b/musl.Dockerfile
@@ -3,8 +3,6 @@ FROM node:18-alpine
 ENV PATH="/aarch64-linux-musl-cross/bin:/usr/local/cargo/bin/rustup:/root/.cargo/bin:$PATH" \
   GN_EXE=gn
 
-COPY aom /usr/aarch64-alpine-linux-musl/aom
-
 RUN apk add --no-cache \
   musl-dev \
   wget \