From 7d69fa550cd9d62ab68ada64e6bd4bd0c7cb59f2 Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Sat, 21 Sep 2024 09:38:47 +0200 Subject: [PATCH 1/5] Switch to musl --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28ee94b..f79730c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,13 +66,13 @@ jobs: - name: Build Linux if: matrix.os == 'ubuntu-latest' run: | - sudo apt install -y gcc-aarch64-linux-gnu - rustup target add aarch64-unknown-linux-gnu - cargo build --release - cargo build --target aarch64-unknown-linux-gnu --release + rustup target add x86_64-unknown-linux-musl + rustup target add aarch64-unknown-linux-musl + cargo build --target x86_64-unknown-linux-musl --release + cargo build --target aarch64-unknown-linux-musl --release mkdir -p out - mv target/release/roast ./roast-linux-x86_64 - mv target/aarch64-unknown-linux-gnu/release/roast ./roast-linux-aarch64 + mv target/x86_64-unknown-linux-musl/release/roast ./roast-linux-x86_64 + mv target/aarch64-unknown-linux-musl/release/roast ./roast-linux-aarch64 chmod +x ./roast-linux-x86_64 ./roast-linux-aarch64 zip out/roast-linux-x86_64.zip ./roast-linux-x86_64 zip out/roast-linux-aarch64.zip ./roast-linux-aarch64 From cf1a571a8d50795a379fbb5f2fc58569ee533b34 Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Sat, 21 Sep 2024 09:44:30 +0200 Subject: [PATCH 2/5] Add gcc aarch64 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f79730c..c9ece49 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,6 +66,7 @@ jobs: - name: Build Linux if: matrix.os == 'ubuntu-latest' run: | + sudo apt install -y gcc-aarch64-linux-gnu rustup target add x86_64-unknown-linux-musl rustup target add aarch64-unknown-linux-musl cargo build --target x86_64-unknown-linux-musl --release From 0c8a71e23032f6f7ea272c767aa40436936563c6 Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Sat, 21 Sep 2024 09:51:46 +0200 Subject: [PATCH 3/5] Add musl-tools --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c9ece49..83d48d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,7 +66,7 @@ jobs: - name: Build Linux if: matrix.os == 'ubuntu-latest' run: | - sudo apt install -y gcc-aarch64-linux-gnu + sudo apt install -y musl-tools rustup target add x86_64-unknown-linux-musl rustup target add aarch64-unknown-linux-musl cargo build --target x86_64-unknown-linux-musl --release From 31590ec73655c0a326d872643958506da38f233a Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Sat, 21 Sep 2024 09:58:37 +0200 Subject: [PATCH 4/5] Specify musl-gcc as linker --- .cargo/config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 90bacbc..5a9deb4 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,3 +1,4 @@ - [target.aarch64-unknown-linux-gnu] linker = "aarch64-linux-gnu-gcc" +[target.x86_64-unknown-linux-musl] +linker = "musl-gcc" From 65504fa9e9a3f137e73f26058e5fcf6ecd283e1a Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Sat, 21 Sep 2024 10:01:33 +0200 Subject: [PATCH 5/5] Specify musl-gcc as linker --- .cargo/config.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cargo/config.toml b/.cargo/config.toml index 5a9deb4..7f894e8 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,3 +2,5 @@ linker = "aarch64-linux-gnu-gcc" [target.x86_64-unknown-linux-musl] linker = "musl-gcc" +[target.aarch64-unknown-linux-musl] +linker = "musl-gcc"