Skip to content

Commit

Permalink
update to macos14 build (#359)
Browse files Browse the repository at this point in the history
  • Loading branch information
ckrause authored Dec 14, 2024
1 parent b5ede40 commit dcfd39c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 29 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,6 @@ jobs:
asset_content_type: application/octet-stream
env:
GITHUB_TOKEN: ${{ github.token }}
build-macos:
needs: create-release
runs-on: macos-14
steps:
- uses: actions/checkout@v2
- name: Build
run: |
cd src
make -f Makefile.macos-x86.mk loda LODA_PLATFORM=macos LODA_VERSION=${{ needs.create-release.outputs.version }}
mv loda loda-x86
make clean
make -f Makefile.macos-arm64.mk loda LODA_PLATFORM=macos LODA_VERSION=${{ needs.create-release.outputs.version }}
mv loda loda-arm64
lipo -create -output loda loda-x86 loda-arm64
rm loda-x86 loda-arm64
file loda
- name: Upload
uses: actions/upload-release-asset@v1
with:
upload_url: ${{ needs.create-release.outputs.upload_url }}
asset_path: ./loda
asset_name: loda-macos
asset_content_type: application/octet-stream
env:
GITHUB_TOKEN: ${{ github.token }}
build-macos-x86:
needs: create-release
runs-on: macos-14
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.macos-arm64.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BEGIN PLATFORM CONFIG FOR MAC OS ARM64
CXX = clang++
CXXFLAGS = -target arm64-apple-macos11
LDFLAGS = -target arm64-apple-macos11
CXXFLAGS = -target arm64-apple-macos14
LDFLAGS = -target arm64-apple-macos14
# END PLATFORM CONFIG FOR MAC OS ARM64

include Makefile
4 changes: 2 additions & 2 deletions src/Makefile.macos-x86.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BEGIN PLATFORM CONFIG FOR MAC OS X86
CXX = clang++
CXXFLAGS = -target x86_64-apple-macos11
LDFLAGS = -target x86_64-apple-macos11
CXXFLAGS = -target x86_64-apple-macos14
LDFLAGS = -target x86_64-apple-macos14
# END PLATFORM CONFIG FOR MAC OS X86

include Makefile

0 comments on commit dcfd39c

Please sign in to comment.