From fb68c101fb08022922ebd7206ee9221e65d4c874 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2024 19:20:06 -0500 Subject: [PATCH 1/2] Add macOS build to workflow --- .github/workflows/build.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daec929a..6ee25b02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ env: IS_DEPLOY: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} jobs: - build: + build-linux: runs-on: ubuntu-latest steps: @@ -47,9 +47,24 @@ jobs: name: agbcc.tar.gz path: agbcc.tar.gz + build-macos: + runs-on: macos-latest + steps: + + - name: Checkout + uses: actions/checkout@main + + - name: Install deps + run: | + brew install arm-none-eabi-binutils + brew install arm-none-eabi-gcc + + - name: Compile + run: sh build.sh + deploy: runs-on: ubuntu-latest - needs: build + needs: build-linux if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} permissions: contents: write From 522e2c647c679d8a0558c4b6997aef20f26edd64 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2024 19:20:14 -0500 Subject: [PATCH 2/2] Fix macOS build --- gcc/Makefile | 2 +- gcc_arm/Makefile.in | 2 +- gcc_arm/configure | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/Makefile b/gcc/Makefile index 9756e901..c34b354e 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -24,7 +24,7 @@ VPATH = $(srcdir) CC = gcc -BASE_CFLAGS = -g -std=gnu11 -Werror-implicit-function-declaration +BASE_CFLAGS = -g -std=gnu11 -Werror-implicit-function-declaration -Wno-error=incompatible-pointer-types INCLUDES = -I. -I$(srcdir) diff --git a/gcc_arm/Makefile.in b/gcc_arm/Makefile.in index 09a87117..10641b80 100755 --- a/gcc_arm/Makefile.in +++ b/gcc_arm/Makefile.in @@ -64,7 +64,7 @@ ALLOCA_FINISH = true XCFLAGS = TCFLAGS = # CYGNUS LOCAL nowarnings/law -CFLAGS = -g -Werror-implicit-function-declaration +CFLAGS = -g -Werror-implicit-function-declaration -Wno-error=incompatible-pointer-types BOOT_CFLAGS = -O2 $(CFLAGS) WARN_CFLAGS = # END CYGNUS LOCAL diff --git a/gcc_arm/configure b/gcc_arm/configure index 05c0782f..0b7738dc 100755 --- a/gcc_arm/configure +++ b/gcc_arm/configure @@ -1138,7 +1138,7 @@ cat > conftest.$ac_ext << EOF #line 1139 "configure" #include "confdefs.h" -main(){return(0);} +int main(){return(0);} EOF if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes