Skip to content

Commit

Permalink
Merge pull request #76 from GriffinRichards/fix-macos
Browse files Browse the repository at this point in the history
Fix build on Apple silicon
  • Loading branch information
luckytyphlosion authored Dec 28, 2024
2 parents cd0ed12 + 522e2c6 commit c3e2919
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
19 changes: 17 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gcc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion gcc_arm/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gcc_arm/configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c3e2919

Please sign in to comment.