From 92a8661ac3b96fb64abe16a8b41d8e9455bdd0f9 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Mon, 21 Mar 2022 03:37:39 +0100 Subject: [PATCH] gh: Drop building limine-s2deploy-linux-x86_32 and use musl --- .github/workflows/release.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47480d87..c659b40c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,10 @@ jobs: run: echo "BRANCH_NAME=$(echo "$TAG_NAME" | grep -o 'v[0-9]\+\.')0-branch" >> $GITHUB_ENV - name: Install dependencies - run: sudo apt-get update && sudo apt-get install git build-essential autoconf automake nasm gcc-mingw-w64 gcc-multilib curl mtools -y + run: sudo apt-get update && sudo apt-get install git build-essential autoconf automake nasm gcc-mingw-w64 curl mtools -y + + - name: Install musl-gcc + run: curl -o musl-1.2.2.tar.gz https://musl.libc.org/releases/musl-1.2.2.tar.gz && tar -xf musl-1.2.2.tar.gz && cd musl-1.2.2 && ./configure --prefix=/usr/local && make && sudo make install - name: Build the toolchain run: ./make_toolchain.sh @@ -44,7 +47,7 @@ jobs: run: rm build/bin/limine-s2deploy - name: Build limine-s2deploy-linux-x86_64 - run: make -C build CFLAGS="-O2 -pipe -static" limine-s2deploy + run: make -C build CC="musl-gcc" CFLAGS="-O2 -pipe" LDFLAGS="-static" limine-s2deploy - name: Strip limine-s2deploy-linux-x86_64 run: strip build/bin/limine-s2deploy @@ -52,15 +55,6 @@ jobs: - name: Rename limine-s2deploy-linux-x86_64 run: mv build/bin/limine-s2deploy build/bin/limine-s2deploy-linux-x86_64 - - name: Build limine-s2deploy-linux-x86_32 - run: make -C build CC="gcc -m32" CFLAGS="-O2 -pipe -static" limine-s2deploy - - - name: Strip limine-s2deploy-linux-x86_32 - run: strip build/bin/limine-s2deploy - - - name: Rename limine-s2deploy-linux-x86_32 - run: mv build/bin/limine-s2deploy build/bin/limine-s2deploy-linux-x86_32 - - name: Build limine-s2deploy-win32 run: make -C build CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-s2deploy