Skip to content

Commit

Permalink
[Patmos][CI] Fix Macos build
Browse files Browse the repository at this point in the history
* update newlib commit hash

* add texinfo for mac builds to ensure newlib can build

* remove duplicate build platform macos-latest
  • Loading branch information
Emoun committed Sep 16, 2024
1 parent a621b2c commit 97bd4f9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build-test-all/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ runs:
- name: Download Newlib
if: inputs.enable-package == 'true'
env:
NEWLIB_COMMIT: 4a74fe0ca51e6f462999446f8adbfd8f6b8c91e5
NEWLIB_COMMIT: 408f6eec21fb0fe5cb66c0691922451c20c1b938
shell: bash
run: |
git clone https://github.com/t-crest/patmos-newlib ${{env.NEWLIB_PATH}}
Expand All @@ -180,7 +180,7 @@ runs:
working-directory: ${{env.NEWLIB_BUILD_PATH}}
shell: bash
run: |
$GITHUB_WORKSPACE/$NEWLIB_PATH/configure --target=patmos-unknown-unknown-elf AR_FOR_TARGET=ar CC_FOR_TARGET="$GITHUB_WORKSPACE/$BUILD_PATH/bin/clang" CFLAGS_FOR_TARGET="-target patmos-unknown-unknown-elf -O2 -D__GLIBC_USE\(...\)=0" RANLIB_FOR_TARGET=ranlib LD_FOR_TARGET="$GITHUB_WORKSPACE/$BUILD_PATH/bin/clang"
$GITHUB_WORKSPACE/$NEWLIB_PATH/configure MKDIR_P="/bin/mkdir -p" --target=patmos-unknown-unknown-elf AR_FOR_TARGET=ar CC_FOR_TARGET="$GITHUB_WORKSPACE/$BUILD_PATH/bin/clang" CFLAGS_FOR_TARGET="-target patmos-unknown-unknown-elf -O2 -D__GLIBC_USE\(...\)=0" RANLIB_FOR_TARGET=ranlib LD_FOR_TARGET="$GITHUB_WORKSPACE/$BUILD_PATH/bin/clang"
make $J
rm -rf *
# Build newlib properly to LLVM-IR
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
name: Install GNU-tar as 'tar'
shell: bash
run: |
brew install gnu-tar
brew install gnu-tar texinfo
# Set gtar to be available as 'tar'
echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
- name: Create Installation Directory
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/patmos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ jobs:
- platform: ubuntu-20.04
cc: gcc
cxx: g++
- platform: macos-latest
cc: clang
cxx: clang++
- platform: macos-latest # ARM
cc: clang
cxx: clang++
Expand Down Expand Up @@ -114,9 +111,6 @@ jobs:
- platform: ubuntu-20.04
cc: gcc
cxx: g++
- platform: macos-latest
cc: clang
cxx: clang++
- platform: macos-latest # ARM
cc: clang
cxx: clang++
Expand Down Expand Up @@ -182,4 +176,4 @@ jobs:
uses: softprops/action-gh-release@v1
with:
files: ${{env.BUILD_PATH}}/patmos-unknown-unknown-elf/package-temp/patmos-llvm-*.tar.gz


0 comments on commit 97bd4f9

Please sign in to comment.