Skip to content
This repository has been archived by the owner on Sep 2, 2023. It is now read-only.

Commit

Permalink
Merge pull request #7 from mrisc32/feature/macos_fat_binary
Browse files Browse the repository at this point in the history
CI: Build fat binaries for macos
  • Loading branch information
mbitsnbites authored Dec 7, 2021
2 parents 5ac7183 + e5d5398 commit 16513a5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ jobs:
archive_type: "tar",
}
- {
name: "macOS x86_64",
name: "macOS arm64 + x86_64",
os: macos-latest,
shell: "bash",
build_type: "native",
cc: "clang",
cxx: "clang++",
cflags: "-O2",
cxxflags: "-O2",
cflags: "-O2 -arch x86_64 -arch arm64",
cxxflags: "-O2 -arch x86_64 -arch arm64",
ldflags: "",
artifact: "mrisc32-gnu-toolchain-macos-x86_64.zip",
artifact: "mrisc32-gnu-toolchain-macos.zip",
archive_type: "zip",
}
- {
Expand Down Expand Up @@ -168,8 +168,8 @@ jobs:
artifact_content_type: "application/x-tar",
}
- {
name: "macOS x86_64",
artifact: "mrisc32-gnu-toolchain-macos-x86_64.zip",
name: "macOS arm64 + x86_64",
artifact: "mrisc32-gnu-toolchain-macos.zip",
artifact_content_type: "application/zip",
}
- {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The latest pre-built version of the toolchain can be found [here](https://github
Binaries are available for:

* Linux (x86_64)
* macOS (x86_64)
* macOS (arm64 + x86_64)
* Windows (x86_64)

## Installation
Expand Down
2 changes: 2 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ if [ "$BUILD_BOOTSTRAP" == "yes" ] ; then
--with-newlib \
--with-gnu-as \
--with-gnu-ld \
--without-zstd \
> "${LATEST_LOG}" 2>&1

echo " Building..."
Expand Down Expand Up @@ -278,6 +279,7 @@ if [ "$BUILD_GCC" == "yes" ] ; then
--disable-shared \
--disable-libssp \
--disable-libstdcxx-pch \
--without-zstd \
> "${LATEST_LOG}" 2>&1

echo " Building..."
Expand Down

0 comments on commit 16513a5

Please sign in to comment.