Skip to content

Commit dcfd39c

Browse files
authored
update to macos14 build (#359)
1 parent b5ede40 commit dcfd39c

File tree

3 files changed

+4
-29
lines changed

3 files changed

+4
-29
lines changed

.github/workflows/release.yml

-25
Original file line numberDiff line numberDiff line change
@@ -58,31 +58,6 @@ jobs:
5858
asset_content_type: application/octet-stream
5959
env:
6060
GITHUB_TOKEN: ${{ github.token }}
61-
build-macos:
62-
needs: create-release
63-
runs-on: macos-14
64-
steps:
65-
- uses: actions/checkout@v2
66-
- name: Build
67-
run: |
68-
cd src
69-
make -f Makefile.macos-x86.mk loda LODA_PLATFORM=macos LODA_VERSION=${{ needs.create-release.outputs.version }}
70-
mv loda loda-x86
71-
make clean
72-
make -f Makefile.macos-arm64.mk loda LODA_PLATFORM=macos LODA_VERSION=${{ needs.create-release.outputs.version }}
73-
mv loda loda-arm64
74-
lipo -create -output loda loda-x86 loda-arm64
75-
rm loda-x86 loda-arm64
76-
file loda
77-
- name: Upload
78-
uses: actions/upload-release-asset@v1
79-
with:
80-
upload_url: ${{ needs.create-release.outputs.upload_url }}
81-
asset_path: ./loda
82-
asset_name: loda-macos
83-
asset_content_type: application/octet-stream
84-
env:
85-
GITHUB_TOKEN: ${{ github.token }}
8661
build-macos-x86:
8762
needs: create-release
8863
runs-on: macos-14

src/Makefile.macos-arm64.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# BEGIN PLATFORM CONFIG FOR MAC OS ARM64
22
CXX = clang++
3-
CXXFLAGS = -target arm64-apple-macos11
4-
LDFLAGS = -target arm64-apple-macos11
3+
CXXFLAGS = -target arm64-apple-macos14
4+
LDFLAGS = -target arm64-apple-macos14
55
# END PLATFORM CONFIG FOR MAC OS ARM64
66

77
include Makefile

src/Makefile.macos-x86.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# BEGIN PLATFORM CONFIG FOR MAC OS X86
22
CXX = clang++
3-
CXXFLAGS = -target x86_64-apple-macos11
4-
LDFLAGS = -target x86_64-apple-macos11
3+
CXXFLAGS = -target x86_64-apple-macos14
4+
LDFLAGS = -target x86_64-apple-macos14
55
# END PLATFORM CONFIG FOR MAC OS X86
66

77
include Makefile

0 commit comments

Comments
 (0)